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/qquickpathview | |
| 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/qquickpathview')
| -rw-r--r-- | tests/auto/quick/qquickpathview/tst_qquickpathview.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp index c007310b53..16545fe815 100644 --- a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp +++ b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp @@ -1927,8 +1927,8 @@ void tst_QQuickPathView::positionViewAtIndex() window->setSource(testFileUrl("pathview3.qml")); window->show(); window->requestActivateWindow(); - QTest::qWaitForWindowShown(window); - QTRY_COMPARE(window, qGuiApp->focusWindow()); + QVERIFY(QTest::qWaitForWindowActive(window)); + QCOMPARE(window, qGuiApp->focusWindow()); QQuickPathView *pathview = qobject_cast<QQuickPathView*>(window->rootObject()); QVERIFY(pathview != 0); @@ -1991,8 +1991,8 @@ void tst_QQuickPathView::indexAt_itemAt() window->setSource(testFileUrl("pathview3.qml")); window->show(); window->requestActivateWindow(); - QTest::qWaitForWindowShown(window); - QTRY_COMPARE(window, qGuiApp->focusWindow()); + QVERIFY(QTest::qWaitForWindowActive(window)); + QCOMPARE(window, qGuiApp->focusWindow()); QQuickPathView *pathview = qobject_cast<QQuickPathView*>(window->rootObject()); QVERIFY(pathview != 0); |