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/qquicktext/tst_qquicktext.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/auto/quick/qquicktext') diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp index da5a5245fa..57ba6ce071 100644 --- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp +++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp @@ -1858,7 +1858,7 @@ void tst_qquicktext::embeddedImages() QQuickView *view = new QQuickView(qmlfile); view->show(); view->requestActivateWindow(); - QTest::qWaitForWindowShown(view); + QVERIFY(QTest::qWaitForWindowActive(view)); QQuickText *textObject = qobject_cast(view->rootObject()); QVERIFY(textObject != 0); @@ -2470,7 +2470,7 @@ void tst_qquicktext::lineLaidOutRelayout() window->show(); window->requestActivateWindow(); - QTest::qWaitForWindowShown(window); + QVERIFY(QTest::qWaitForWindowActive(window)); QQuickText *myText = window->rootObject()->findChild("myText"); QVERIFY(myText != 0); @@ -3575,7 +3575,7 @@ void tst_qquicktext::htmlLists() view->show(); view->requestActivateWindow(); - QTest::qWaitForWindowShown(view); + QVERIFY(QTest::qWaitForWindowActive(view)); QCOMPARE(textPrivate->extra->doc->lineCount(), nbLines); -- cgit v1.2.3