diff options
author | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-01-31 13:58:44 +1000 |
---|---|---|
committer | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-01-31 06:34:44 +0100 |
commit | f973bb1730e1138f9c745d142c1f2f5d9c53b456 (patch) | |
tree | c04bc36a5ae8fddf29e6fe37f55e3ec2af59de3f /tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp | |
parent | dbf35e498db723ae9850686e462ec4f45bc7b67c (diff) |
Fix compile failures.
Remove uses of QLineControl, QTextControl and QBool and forward
declared QGraphicsWidget.
Change-Id: Ic5184a1d5aebfb1100ad0e24444b6773f4e617e8
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Diffstat (limited to 'tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp')
-rw-r--r-- | tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp index f8731f9f..6952dc91 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp +++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp @@ -992,12 +992,12 @@ void tst_qdeclarativeecmascript::dynamicDestruction() QMetaObject::invokeMethod(object, "killOther"); QVERIFY(createdQmlObject); - QCoreApplication::instance()->processEvents(QEventLoop::DeferredDeletion); + QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete); QVERIFY(createdQmlObject); for (int ii = 0; createdQmlObject && ii < 50; ++ii) { // After 5 seconds we should give up if (createdQmlObject) { QTest::qWait(100); - QCoreApplication::instance()->processEvents(QEventLoop::DeferredDeletion); + QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete); } } QVERIFY(!createdQmlObject); @@ -1006,7 +1006,7 @@ void tst_qdeclarativeecmascript::dynamicDestruction() QMetaObject::invokeMethod(object, "killMe"); QVERIFY(object); QTest::qWait(0); - QCoreApplication::instance()->processEvents(QEventLoop::DeferredDeletion); + QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete); QVERIFY(!object); } @@ -2129,7 +2129,7 @@ void tst_qdeclarativeecmascript::ownership() QObject *object = component.create(context); QDeclarativeEnginePrivate::getScriptEngine(&engine)->collectGarbage(); - QCoreApplication::processEvents(QEventLoop::DeferredDeletion); + QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete); QVERIFY(own.object == 0); @@ -2146,7 +2146,7 @@ void tst_qdeclarativeecmascript::ownership() QObject *object = component.create(context); QDeclarativeEnginePrivate::getScriptEngine(&engine)->collectGarbage(); - QCoreApplication::processEvents(QEventLoop::DeferredDeletion); + QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete); QVERIFY(own.object != 0); @@ -2199,7 +2199,7 @@ void tst_qdeclarativeecmascript::cppOwnershipReturnValue() delete object; } - QCoreApplication::instance()->processEvents(QEventLoop::DeferredDeletion); + QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete); QVERIFY(source.value != 0); } @@ -2226,7 +2226,7 @@ void tst_qdeclarativeecmascript::ownershipCustomReturnValue() delete object; } - QCoreApplication::instance()->processEvents(QEventLoop::DeferredDeletion); + QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete); QVERIFY(source.value == 0); } |