diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-07-19 14:13:14 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-19 14:37:49 +0200 |
| commit | bd618f62d8d796638ee72374a0fcdfd6c6b7aa97 (patch) | |
| tree | 708e1e6e1f7b0aefe5d828eb832b6fff24c9af66 /tests/auto/quick/qquickfocusscope | |
| parent | 5480e6c2875d434a3c2264bc50d58cabdd055468 (diff) | |
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 <stephen.kelly@kdab.com>
Diffstat (limited to 'tests/auto/quick/qquickfocusscope')
| -rw-r--r-- | tests/auto/quick/qquickfocusscope/tst_qquickfocusscope.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/quick/qquickfocusscope/tst_qquickfocusscope.cpp b/tests/auto/quick/qquickfocusscope/tst_qquickfocusscope.cpp index 34e5ce0f8d..cca8cfb7f4 100644 --- a/tests/auto/quick/qquickfocusscope/tst_qquickfocusscope.cpp +++ b/tests/auto/quick/qquickfocusscope/tst_qquickfocusscope.cpp @@ -160,8 +160,8 @@ void tst_qquickfocusscope::noFocus() view->show(); view->requestActivateWindow(); - QTest::qWaitForWindowShown(view); - QTRY_VERIFY(view == qGuiApp->focusWindow()); + QVERIFY(QTest::qWaitForWindowActive(view)); + QVERIFY(view == qGuiApp->focusWindow()); QVERIFY(item0->hasActiveFocus() == false); QVERIFY(item1->hasActiveFocus() == false); @@ -368,7 +368,7 @@ void tst_qquickfocusscope::qtBug13380() view->requestActivateWindow(); qApp->processEvents(); - QTest::qWaitForWindowShown(view); + QVERIFY(QTest::qWaitForWindowExposed(view)); QTRY_VERIFY(view == qGuiApp->focusWindow()); QVERIFY(view->rootObject()->property("noFocus").toBool()); @@ -386,7 +386,7 @@ void tst_qquickfocusscope::forceActiveFocus() view->show(); view->requestActivateWindow(); - QTest::qWaitForWindowShown(view); + QVERIFY(QTest::qWaitForWindowExposed(view)); QTRY_VERIFY(view == qGuiApp->focusWindow()); QQuickItem *rootObject = view->rootObject(); @@ -540,8 +540,8 @@ void tst_qquickfocusscope::canvasFocus() view->show(); view->requestActivateWindow(); - QTest::qWaitForWindowShown(view); - QTRY_VERIFY(view == qGuiApp->focusWindow()); + QVERIFY(QTest::qWaitForWindowActive(view)); + QVERIFY(view == qGuiApp->focusWindow()); // Now the window has focus, active focus given to item1 QCOMPARE(rootItem->hasFocus(), true); @@ -612,8 +612,8 @@ void tst_qquickfocusscope::canvasFocus() // give the window focus, and item2 will get active focus view->show(); view->requestActivateWindow(); - QTest::qWaitForWindowShown(view); - QTRY_VERIFY(QGuiApplication::focusWindow() == view); + QVERIFY(QTest::qWaitForWindowActive(view)); + QVERIFY(QGuiApplication::focusWindow() == view); QCOMPARE(rootItem->hasFocus(), true); QCOMPARE(rootItem->hasActiveFocus(), true); |