From bd618f62d8d796638ee72374a0fcdfd6c6b7aa97 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 19 Jul 2012 14:13:14 +0200 Subject: QtDeclarative: Remove usage of deprecated qWaitForWindowShown(). - Replace by qWaitForWindowExposed() or qWaitForWindowActive() where applicable. - Use QVERIFY to verify success. - Stabilize some tests by checking for 'active', add missing call to show(). Change-Id: I6cae063e44a3839760ed9f61dacb26cd1717118d Reviewed-by: Stephen Kelly --- tests/auto/quick/qquickpincharea/tst_qquickpincharea.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/auto/quick/qquickpincharea') diff --git a/tests/auto/quick/qquickpincharea/tst_qquickpincharea.cpp b/tests/auto/quick/qquickpincharea/tst_qquickpincharea.cpp index 5c765b2eca..857bc3a5e3 100644 --- a/tests/auto/quick/qquickpincharea/tst_qquickpincharea.cpp +++ b/tests/auto/quick/qquickpincharea/tst_qquickpincharea.cpp @@ -213,7 +213,7 @@ void tst_QQuickPinchArea::scale() window->setSource(testFileUrl("pinchproperties.qml")); window->show(); window->requestActivateWindow(); - QTest::qWaitForWindowShown(window); + QVERIFY(QTest::qWaitForWindowActive(window)); QVERIFY(window->rootObject() != 0); qApp->processEvents(); @@ -276,7 +276,7 @@ void tst_QQuickPinchArea::pan() window->setSource(testFileUrl("pinchproperties.qml")); window->show(); window->requestActivateWindow(); - QTest::qWaitForWindowShown(window); + QVERIFY(QTest::qWaitForWindowActive(window)); QVERIFY(window->rootObject() != 0); qApp->processEvents(); @@ -337,7 +337,7 @@ void tst_QQuickPinchArea::retouch() window->setSource(testFileUrl("pinchproperties.qml")); window->show(); window->requestActivateWindow(); - QTest::qWaitForWindowShown(window); + QVERIFY(QTest::qWaitForWindowActive(window)); QVERIFY(window->rootObject() != 0); qApp->processEvents(); @@ -451,7 +451,7 @@ void tst_QQuickPinchArea::transformedPinchArea() view->setSource(testFileUrl("transformedPinchArea.qml")); view->show(); view->requestActivateWindow(); - QTest::qWaitForWindowShown(view); + QVERIFY(QTest::qWaitForWindowActive(view)); QVERIFY(view->rootObject() != 0); qApp->processEvents(); -- cgit v1.2.3