Port away from qWaitForWindowShown.

It is deprecated.

Change-Id: Icf29b1f5ab6cb06ee7fd375fb96242df7ee3083e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

diff --git a/tests/auto/particles/shared/particlestestsshared.h b/tests/auto/particles/shared/particlestestsshared.h
index 6cd805a..f1c7c85 100644 (file)
--- 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 7b98099..60f7469 100644 (file)
--- 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));