[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 705dba76d1073c50875cad6c72d462bb91162499
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 18 22:08:38 2002 +0000

    	- fixed 3078293 -- Implement evaluateJavaScript on WebController
    
            * kwq/KWQVariant.mm: (QVariant::asString): Made this return reasonable
    	values for types other than string. Still may be loose ends left, but
    	this takes care of most of it.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2373 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 710e2dd..5eb6b09 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,13 @@
 2002-10-18  Darin Adler  <darin at apple.com>
 
+	- fixed 3078293 -- Implement evaluateJavaScript on WebController
+
+        * kwq/KWQVariant.mm: (QVariant::asString): Made this return reasonable
+	values for types other than string. Still may be loose ends left, but
+	this takes care of most of it.
+
+2002-10-18  Darin Adler  <darin at apple.com>
+
         * kwq/WebCoreBridge.h:
         * kwq/WebCoreBridge.mm:
         (-[WebCoreBridge stringByEvaluatingJavaScriptFromString:]):
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 710e2dd..5eb6b09 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,13 @@
 2002-10-18  Darin Adler  <darin at apple.com>
 
+	- fixed 3078293 -- Implement evaluateJavaScript on WebController
+
+        * kwq/KWQVariant.mm: (QVariant::asString): Made this return reasonable
+	values for types other than string. Still may be loose ends left, but
+	this takes care of most of it.
+
+2002-10-18  Darin Adler  <darin at apple.com>
+
         * kwq/WebCoreBridge.h:
         * kwq/WebCoreBridge.mm:
         (-[WebCoreBridge stringByEvaluatingJavaScriptFromString:]):
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 710e2dd..5eb6b09 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,13 @@
 2002-10-18  Darin Adler  <darin at apple.com>
 
+	- fixed 3078293 -- Implement evaluateJavaScript on WebController
+
+        * kwq/KWQVariant.mm: (QVariant::asString): Made this return reasonable
+	values for types other than string. Still may be loose ends left, but
+	this takes care of most of it.
+
+2002-10-18  Darin Adler  <darin at apple.com>
+
         * kwq/WebCoreBridge.h:
         * kwq/WebCoreBridge.mm:
         (-[WebCoreBridge stringByEvaluatingJavaScriptFromString:]):
diff --git a/WebCore/kwq/KWQVariant.mm b/WebCore/kwq/KWQVariant.mm
index 33e1d1a..4fb0229 100644
--- a/WebCore/kwq/KWQVariant.mm
+++ b/WebCore/kwq/KWQVariant.mm
@@ -131,10 +131,13 @@ QString QVariant::asString() const
     switch (d->t) {
     case String:
         return *(QString *)d->value.p;
-    case Invalid:
     case Bool:
+        return QString(d->value.b ? "true" : "false");
     case UInt:
+        return QString().setNum(d->value.u);
     case Double:
+        return QString().setNum(d->value.d);
+    case Invalid:
         break;
     }
     return QString();

-- 
WebKit Debian packaging