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/qquickgridview | |
| 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/qquickgridview')
| -rw-r--r-- | tests/auto/quick/qquickgridview/tst_qquickgridview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp index bb10d53c17..13753ea39c 100644 --- a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp +++ b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp @@ -5628,7 +5628,7 @@ void tst_QQuickGridView::multipleTransitions() ctxt->setContextProperty("rippleAddDisplaced", rippleAddDisplaced); window->setSource(testFileUrl("multipleTransitions.qml")); window->show(); - QTest::qWaitForWindowShown(window); + QVERIFY(QTest::qWaitForWindowExposed(window)); QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid"); QTRY_VERIFY(gridview != 0); @@ -5793,7 +5793,7 @@ void tst_QQuickGridView::multipleDisplaced() ctxt->setContextProperty("testModel", &model); window->setSource(testFileUrl("multipleDisplaced.qml")); window->show(); - QTest::qWaitForWindowShown(window); + QVERIFY(QTest::qWaitForWindowExposed(window)); QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid"); QTRY_VERIFY(gridview != 0); |