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/qquickfocusscope | |
| parent | 3bb7128fb705fa88ba955ca0ae6bd44fcef8fa4b (diff) | |
| download | qtdeclarative-c20463631ddbb4513bec100c22c74b8a919156a1.tar.gz | |
QtQuick: Remove usages of qWaitForWindowShown(QWindow *).
Change-Id: I722e20b2fb8d8c6c19c6f3f2cb16910d7433e9a4
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'tests/auto/quick/qquickfocusscope')
| -rw-r--r-- | tests/auto/quick/qquickfocusscope/tst_qquickfocusscope.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/quick/qquickfocusscope/tst_qquickfocusscope.cpp b/tests/auto/quick/qquickfocusscope/tst_qquickfocusscope.cpp index cca8cfb7f4..5c36482871 100644 --- a/tests/auto/quick/qquickfocusscope/tst_qquickfocusscope.cpp +++ b/tests/auto/quick/qquickfocusscope/tst_qquickfocusscope.cpp @@ -566,8 +566,8 @@ void tst_qquickfocusscope::canvasFocus() // view->hide(); // seemingly doesn't remove focus, so have an another view steal it. alternateView.show(); alternateView.requestActivateWindow(); - QTest::qWaitForWindowShown(&alternateView); - QTRY_VERIFY(QGuiApplication::focusWindow() == &alternateView); + QVERIFY(QTest::qWaitForWindowActive(&alternateView)); + QVERIFY(QGuiApplication::focusWindow() == &alternateView); QCOMPARE(rootItem->hasFocus(), false); QCOMPARE(rootItem->hasActiveFocus(), false); |