diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-07-24 14:56:35 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-24 16:53:08 +0200 |
| commit | c20463631ddbb4513bec100c22c74b8a919156a1 (patch) | |
| tree | a6f9d35185a7deb89e7ef568e4e4dd929f0d6982 /tests/auto/quick/qquicktext | |
| parent | 3bb7128fb705fa88ba955ca0ae6bd44fcef8fa4b (diff) | |
QtQuick: Remove usages of qWaitForWindowShown(QWindow *).
Change-Id: I722e20b2fb8d8c6c19c6f3f2cb16910d7433e9a4
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'tests/auto/quick/qquicktext')
| -rw-r--r-- | tests/auto/quick/qquicktext/tst_qquicktext.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp index 57ba6ce071..e6368c010e 100644 --- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp +++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp @@ -866,7 +866,7 @@ void tst_qquicktext::hAlignImplicitWidth() QQuickView view(testFileUrl("hAlignImplicitWidth.qml")); view.show(); view.requestActivateWindow(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowActive(&view)); QQuickText *text = view.rootObject()->findChild<QQuickText*>("textItem"); QVERIFY(text != 0); @@ -1270,7 +1270,7 @@ void tst_qquicktext::underline() QQuickView view(testFileUrl("underline.qml")); view.show(); view.requestActivateWindow(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowActive(&view)); QQuickText *textObject = view.rootObject()->findChild<QQuickText*>("myText"); QVERIFY(textObject != 0); QCOMPARE(textObject->font().overline(), false); @@ -1283,7 +1283,7 @@ void tst_qquicktext::overline() QQuickView view(testFileUrl("overline.qml")); view.show(); view.requestActivateWindow(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowActive(&view)); QQuickText *textObject = view.rootObject()->findChild<QQuickText*>("myText"); QVERIFY(textObject != 0); QCOMPARE(textObject->font().overline(), true); @@ -1296,7 +1296,7 @@ void tst_qquicktext::strikeout() QQuickView view(testFileUrl("strikeout.qml")); view.show(); view.requestActivateWindow(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowActive(&view)); QQuickText *textObject = view.rootObject()->findChild<QQuickText*>("myText"); QVERIFY(textObject != 0); QCOMPARE(textObject->font().overline(), false); |