diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-08-22 11:41:55 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-22 14:21:23 +0200 |
| commit | bffd219c599a9feae521dd9a709b2e20663f49ac (patch) | |
| tree | e1a51c02936fd77d6830f68f3b915bda0ad90f0f /tests | |
| parent | 26ea8e01e9ee2a8c8c09266147b94c9ac92d09f9 (diff) | |
Port away from qWaitForWindowShown.
It is deprecated.
Change-Id: Icf29b1f5ab6cb06ee7fd375fb96242df7ee3083e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/particles/shared/particlestestsshared.h | 2 | ||||
| -rw-r--r-- | tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/particles/shared/particlestestsshared.h b/tests/auto/particles/shared/particlestestsshared.h index 6cd805a64c..f1c7c85140 100644 --- a/tests/auto/particles/shared/particlestestsshared.h +++ b/tests/auto/particles/shared/particlestestsshared.h @@ -74,7 +74,7 @@ QQuickView* createView(const QUrl &filename, int additionalWait=0) if (view->status() != QQuickView::Ready) return 0; view->show(); - QTest::qWaitForWindowShown(view); + QTest::qWaitForWindowExposed(view); if (additionalWait) QTest::qWait(additionalWait); diff --git a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp index 7b9809908d..60f7469aa5 100644 --- a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp +++ b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp @@ -5651,8 +5651,8 @@ void tst_qquicktextinput::backspaceSurrogatePairs() textInput->setParentItem(window.contentItem()); window.show(); window.requestActivateWindow(); - QTest::qWaitForWindowShown(&window); - QTRY_COMPARE(QGuiApplication::focusWindow(), &window); + QVERIFY(QTest::qWaitForWindowActive(&window)); + QCOMPARE(QGuiApplication::focusWindow(), &window); for (int i = text.length(); i >= 0; i -= 2) { QCOMPARE(textInput->text(), text.mid(0, i)); |