[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 6de10ec129844b9b6b8c24de9cc482f1636d06fe
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Aug 14 19:24:30 2010 +0000

    2010-08-14  Tasuku Suzuki  <tasuku.suzuki at nokia.com>
    
            Reviewed by Antonio Gomes.
    
            [Qt] Fix compilation with QT_NO_LINEEDIT
            https://bugs.webkit.org/show_bug.cgi?id=38324
    
            * bridge/qt/qt_runtime.cpp:
            (JSC::Bindings::convertValueToQVariant):
            (JSC::Bindings::convertQVariantToValue):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65371 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c0fa56c..9742a8f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-14  Tasuku Suzuki  <tasuku.suzuki at nokia.com>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt] Fix compilation with QT_NO_LINEEDIT
+        https://bugs.webkit.org/show_bug.cgi?id=38324
+
+        * bridge/qt/qt_runtime.cpp:
+        (JSC::Bindings::convertValueToQVariant):
+        (JSC::Bindings::convertQVariantToValue):
+
 2010-08-14  Rob Buis  <rwlbuis at gmail.com>
 
         Reviewed by Dirk Schulze.
diff --git a/WebCore/bridge/qt/qt_runtime.cpp b/WebCore/bridge/qt/qt_runtime.cpp
index 7bd50d2..6881c2e 100644
--- a/WebCore/bridge/qt/qt_runtime.cpp
+++ b/WebCore/bridge/qt/qt_runtime.cpp
@@ -503,6 +503,7 @@ QVariant convertValueToQVariant(ExecState* exec, JSValue value, QMetaType::Type
                     ret = QTime(gdt.hour, gdt.minute, gdt.second);
                     dist = 10;
                 }
+#ifndef QT_NO_DATESTRING
             } else if (type == String) {
                 UString ustring = value.toString(exec);
                 QString qstring = QString((const QChar*)ustring.impl()->characters(), ustring.length());
@@ -544,6 +545,7 @@ QVariant convertValueToQVariant(ExecState* exec, JSValue value, QMetaType::Type
                         dist = 3;
                     }
                 }
+#endif // QT_NO_DATESTRING
             }
             break;
 

-- 
WebKit Debian packaging