[webkit-changes] [126142] trunk/Source/WebCore

[hausmann]

Title: [126142] trunk/Source/WebCore

Revision

126142

Author

hausm...@webkit.org

Date

2012-08-21 01:04:24 -0700 (Tue, 21 Aug 2012)

Log Message

Unreviewed build fix for newer Qt 5 versions: QVariant::WidgetStar has been removed,
but fortunately QMetaType has a much more powerful function available for us to use.

Thanks to Jedrzej Nowacki for the hint :)

* bridge/qt/qt_runtime.cpp:
(JSC::Bindings::convertQVariantToValue):

Modified Paths

• trunk/Source/WebCore/ChangeLog
• trunk/Source/WebCore/bridge/qt/qt_runtime.cpp

Diff

Modified: trunk/Source/WebCore/ChangeLog (126141 => 126142)

--- trunk/Source/WebCore/ChangeLog	2012-08-21 07:33:09 UTC (rev 126141)
+++ trunk/Source/WebCore/ChangeLog	2012-08-21 08:04:24 UTC (rev 126142)
@@ -1,3 +1,13 @@
+2012-08-21  Simon Hausmann  <simon.hausm...@nokia.com>
+
+        Unreviewed build fix for newer Qt 5 versions: QVariant::WidgetStar has been removed,
+        but fortunately QMetaType has a much more powerful function available for us to use.
+
+        Thanks to Jedrzej Nowacki for the hint :)
+
+        * bridge/qt/qt_runtime.cpp:
+        (JSC::Bindings::convertQVariantToValue):
+
 2012-08-21  Kentaro Hara  <hara...@chromium.org>
 
         [V8] Remove String::New() from V8 binding (Part 1)

Modified: trunk/Source/WebCore/bridge/qt/qt_runtime.cpp (126141 => 126142)

--- trunk/Source/WebCore/bridge/qt/qt_runtime.cpp	2012-08-21 07:33:09 UTC (rev 126141)
+++ trunk/Source/WebCore/bridge/qt/qt_runtime.cpp	2012-08-21 08:04:24 UTC (rev 126142)
@@ -783,9 +783,8 @@
 
     qConvDebug() << "convertQVariantToValue: metatype:" << type << ", isnull: " << variant.isNull();
     if (variant.isNull() &&
-        type != QMetaType::QObjectStar &&
+        !QMetaType::typeFlags(type).testFlag(QMetaType::PointerToQObject)) &&
         type != QMetaType::VoidStar &&
-        type != QMetaType::QWidgetStar &&
         type != QMetaType::QString) {
         return jsNull();
     }
@@ -845,7 +844,7 @@
         return toJS(exec, static_cast<JSDOMGlobalObject*>(exec->lexicalGlobalObject()), wtfByteArray.get());
     }
 
-    if (type == QMetaType::QObjectStar || type == QMetaType::QWidgetStar) {
+    if (QMetaType::typeFlags(type).testFlag(QMetaType::PointerToQObject)) {
         QObject* obj = variant.value<QObject*>();
         if (!obj)
             return jsNull();

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes