2010-08-14 Tasuku Suzuki <tasuku.suzuki@nokia.com>
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 14 Aug 2010 19:24:30 +0000 (19:24 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 14 Aug 2010 19:24:30 +0000 (19:24 +0000)
        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: https://svn.webkit.org/repository/webkit/trunk@65371 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/bridge/qt/qt_runtime.cpp

index c0fa56c..9742a8f 100644 (file)
@@ -1,3 +1,14 @@
+2010-08-14  Tasuku Suzuki  <tasuku.suzuki@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@gmail.com>
 
         Reviewed by Dirk Schulze.
index 7bd50d2..6881c2e 100644 (file)
@@ -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;