Imported WebKit commit 42d95198c30c2d1a94a5081181aad0b2be7c316c (http://svn.webkit.org/repository/webkit/trunk@128206)

This includes the rewrite of the configure part of the build system which should fix the QtQuick2 detection
and allow for further simplifications in the future

1 files changed, 4 insertions, 4 deletions

diff --git a/Source/WebKit/qt/tests/qobjectbridge/tst_qobjectbridge.cpp b/Source/WebKit/qt/tests/qobjectbridge/tst_qobjectbridge.cpp
index 13d98af93..ec9c71286 100644
--- a/Source/WebKit/qt/tests/qobjectbridge/tst_qobjectbridge.cpp
+++ b/Source/WebKit/qt/tests/qobjectbridge/tst_qobjectbridge.cpp
@@ -2039,7 +2039,7 @@ void tst_QObjectBridge::ownership()
 {
     // test ownership
     {
-        QWeakPointer<QObject> ptr = new QObject();
+        QPointer<QObject> ptr = new QObject();
         QVERIFY(ptr);
         {
             QWebPage page;
@@ -2049,7 +2049,7 @@ void tst_QObjectBridge::ownership()
         QVERIFY(!ptr);
     }
     {
-        QWeakPointer<QObject> ptr = new QObject();
+        QPointer<QObject> ptr = new QObject();
         QVERIFY(ptr);
         QObject* before = ptr.data();
         {
@@ -2073,7 +2073,7 @@ void tst_QObjectBridge::ownership()
         QCOMPARE(qvariant_cast<QObject*>(v), (QObject *)0);
     }
     {
-        QWeakPointer<QObject> ptr = new QObject();
+        QPointer<QObject> ptr = new QObject();
         QVERIFY(ptr);
         {
             QWebPage page;
@@ -2085,7 +2085,7 @@ void tst_QObjectBridge::ownership()
     }
     {
         QObject* parent = new QObject();
-        QWeakPointer<QObject> child = new QObject(parent);
+        QPointer<QObject> child = new QObject(parent);
         QVERIFY(child);
         {
             QWebPage page;