From c20463631ddbb4513bec100c22c74b8a919156a1 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Tue, 24 Jul 2012 14:56:35 +0200
Subject: [PATCH] QtQuick: Remove usages of qWaitForWindowShown(QWindow *).
Change-Id: I722e20b2fb8d8c6c19c6f3f2cb16910d7433e9a4
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
---
.../auto/quick/qquickfocusscope/tst_qquickfocusscope.cpp | 4 ++--
.../auto/quick/qquickfontloader/tst_qquickfontloader.cpp | 4 ++--
tests/auto/quick/qquickgridview/tst_qquickgridview.cpp | 2 +-
tests/auto/quick/qquickimage/tst_qquickimage.cpp | 2 +-
tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp | 6 +++---
.../quick/qquickpainteditem/tst_qquickpainteditem.cpp | 2 +-
tests/auto/quick/qquickpathview/tst_qquickpathview.cpp | 8 ++++----
tests/auto/quick/qquickscreen/tst_qquickscreen.cpp | 2 +-
tests/auto/quick/qquicktext/tst_qquicktext.cpp | 8 ++++----
tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp | 4 ++--
tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp | 2 +-
.../qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp | 2 +-
tests/auto/quick/qquickwindow/tst_qquickwindow.cpp | 2 +-
tests/auto/quick/rendernode/tst_rendernode.cpp | 2 +-
14 files changed, 25 insertions(+), 25 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);
diff --git a/tests/auto/quick/qquickfontloader/tst_qquickfontloader.cpp b/tests/auto/quick/qquickfontloader/tst_qquickfontloader.cpp
index c6eaf05d36..b5f47a96fd 100644
--- a/tests/auto/quick/qquickfontloader/tst_qquickfontloader.cpp
+++ b/tests/auto/quick/qquickfontloader/tst_qquickfontloader.cpp
@@ -251,8 +251,8 @@ void tst_qquickfontloader::changeFontSourceViaState()
QQuickView window(testFileUrl("qtbug-20268.qml"));
window.show();
window.requestActivateWindow();
- QTest::qWaitForWindowShown(&window);
- QTRY_COMPARE(&window, qGuiApp->focusWindow());
+ QVERIFY(QTest::qWaitForWindowActive(&window));
+ QCOMPARE(&window, qGuiApp->focusWindow());
QQuickFontLoader *fontObject = qobject_cast<QQuickFontLoader*>(qvariant_cast<QObject *>(window.rootObject()->property("fontloader")));
QVERIFY(fontObject != 0);
diff --git a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
index 110df07afa..ef4b27b767 100644
--- a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
+++ b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
@@ -4165,7 +4165,7 @@ void tst_QQuickGridView::columnCount()
window.setSource(testFileUrl("gridview4.qml"));
window.show();
window.requestActivateWindow();
- QTest::qWaitForWindowShown(&window);
+ QVERIFY(QTest::qWaitForWindowActive(&window));
QQuickGridView *view = qobject_cast<QQuickGridView*>(window.rootObject());
diff --git a/tests/auto/quick/qquickimage/tst_qquickimage.cpp b/tests/auto/quick/qquickimage/tst_qquickimage.cpp
index c069a826f6..a8f92cbfa5 100644
--- a/tests/auto/quick/qquickimage/tst_qquickimage.cpp
+++ b/tests/auto/quick/qquickimage/tst_qquickimage.cpp
@@ -499,7 +499,7 @@ void tst_qquickimage::tiling_QTBUG_6716()
QQuickView view(testFileUrl(source));
view.show();
view.requestActivateWindow();
- QTest::qWaitForWindowShown(&view);
+ QVERIFY(QTest::qWaitForWindowActive(&view));
QQuickImage *tiling = findItem<QQuickImage>(view.rootObject(), "tiling");
diff --git a/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp b/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp
index 020a77c1d9..8f20f2241d 100644
--- a/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp
+++ b/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp
@@ -59,7 +59,7 @@ public:
view.setSource(testFileUrl(fileName));
view.show();
- QTest::qWaitForWindowShown(&view);
+ QTest::qWaitForWindowExposed(&view);
return view.grabWindow();
}
@@ -310,7 +310,7 @@ void tst_QQuickItemLayer::layerZOrder()
view.show();
- QTest::qWaitForWindowShown(&view);
+ QVERIFY(QTest::qWaitForWindowExposed(&view));
QImage fb = view.grabWindow();
@@ -347,7 +347,7 @@ void tst_QQuickItemLayer::changeZOrder()
view.show();
- QTest::qWaitForWindowShown(&view);
+ QVERIFY(QTest::qWaitForWindowExposed(&view));
QImage fb = view.grabWindow();
diff --git a/tests/auto/quick/qquickpainteditem/tst_qquickpainteditem.cpp b/tests/auto/quick/qquickpainteditem/tst_qquickpainteditem.cpp
index 8ba27898df..cf579e7951 100644
--- a/tests/auto/quick/qquickpainteditem/tst_qquickpainteditem.cpp
+++ b/tests/auto/quick/qquickpainteditem/tst_qquickpainteditem.cpp
@@ -104,7 +104,7 @@ void tst_QQuickPaintedItem::initTestCase()
{
window.resize(320, 240);
window.show();
- QTest::qWaitForWindowShown(&window);
+ QVERIFY(QTest::qWaitForWindowExposed(&window));
}
void tst_QQuickPaintedItem::update()
diff --git a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
index c007310b53..16545fe815 100644
--- a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
+++ b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
@@ -1927,8 +1927,8 @@ void tst_QQuickPathView::positionViewAtIndex()
window->setSource(testFileUrl("pathview3.qml"));
window->show();
window->requestActivateWindow();
- QTest::qWaitForWindowShown(window);
- QTRY_COMPARE(window, qGuiApp->focusWindow());
+ QVERIFY(QTest::qWaitForWindowActive(window));
+ QCOMPARE(window, qGuiApp->focusWindow());
QQuickPathView *pathview = qobject_cast<QQuickPathView*>(window->rootObject());
QVERIFY(pathview != 0);
@@ -1991,8 +1991,8 @@ void tst_QQuickPathView::indexAt_itemAt()
window->setSource(testFileUrl("pathview3.qml"));
window->show();
window->requestActivateWindow();
- QTest::qWaitForWindowShown(window);
- QTRY_COMPARE(window, qGuiApp->focusWindow());
+ QVERIFY(QTest::qWaitForWindowActive(window));
+ QCOMPARE(window, qGuiApp->focusWindow());
QQuickPathView *pathview = qobject_cast<QQuickPathView*>(window->rootObject());
QVERIFY(pathview != 0);
diff --git a/tests/auto/quick/qquickscreen/tst_qquickscreen.cpp b/tests/auto/quick/qquickscreen/tst_qquickscreen.cpp
index cbf9438f24..8ec0ae4e96 100644
--- a/tests/auto/quick/qquickscreen/tst_qquickscreen.cpp
+++ b/tests/auto/quick/qquickscreen/tst_qquickscreen.cpp
@@ -58,7 +58,7 @@ void tst_qquickscreen::basicProperties()
QQuickView view;
view.setSource(testFileUrl("screen.qml"));
view.show();
- QTest::qWaitForWindowShown(&view);
+ QVERIFY(QTest::qWaitForWindowExposed(&view));
QQuickItem* root = view.rootObject();
QVERIFY(root);
diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp
index 57ba6ce071..e6368c010e 100644
--- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp
+++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp
@@ -866,7 +866,7 @@ void tst_qquicktext::hAlignImplicitWidth()
QQuickView view(testFileUrl("hAlignImplicitWidth.qml"));
view.show();
view.requestActivateWindow();
- QTest::qWaitForWindowShown(&view);
+ QVERIFY(QTest::qWaitForWindowActive(&view));
QQuickText *text = view.rootObject()->findChild<QQuickText*>("textItem");
QVERIFY(text != 0);
@@ -1270,7 +1270,7 @@ void tst_qquicktext::underline()
QQuickView view(testFileUrl("underline.qml"));
view.show();
view.requestActivateWindow();
- QTest::qWaitForWindowShown(&view);
+ QVERIFY(QTest::qWaitForWindowActive(&view));
QQuickText *textObject = view.rootObject()->findChild<QQuickText*>("myText");
QVERIFY(textObject != 0);
QCOMPARE(textObject->font().overline(), false);
@@ -1283,7 +1283,7 @@ void tst_qquicktext::overline()
QQuickView view(testFileUrl("overline.qml"));
view.show();
view.requestActivateWindow();
- QTest::qWaitForWindowShown(&view);
+ QVERIFY(QTest::qWaitForWindowActive(&view));
QQuickText *textObject = view.rootObject()->findChild<QQuickText*>("myText");
QVERIFY(textObject != 0);
QCOMPARE(textObject->font().overline(), true);
@@ -1296,7 +1296,7 @@ void tst_qquicktext::strikeout()
QQuickView view(testFileUrl("strikeout.qml"));
view.show();
view.requestActivateWindow();
- QTest::qWaitForWindowShown(&view);
+ QVERIFY(QTest::qWaitForWindowActive(&view));
QQuickText *textObject = view.rootObject()->findChild<QQuickText*>("myText");
QVERIFY(textObject != 0);
QCOMPARE(textObject->font().overline(), false);
diff --git a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
index fe8beb44f6..3e74b58acf 100644
--- a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
+++ b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
@@ -586,7 +586,7 @@ void tst_qquicktextedit::alignments()
QQuickView window(testFileUrl("alignments.qml"));
window.show();
- QTest::qWaitForWindowShown(&window);
+ QVERIFY(QTest::qWaitForWindowExposed(&window));
QObject *ob = window.rootObject();
QVERIFY(ob != 0);
@@ -815,7 +815,7 @@ void tst_qquicktextedit::hAlignVisual()
{
QQuickView view(testFileUrl("hAlignVisual.qml"));
view.show();
- QTest::qWaitForWindowShown(&view);
+ QVERIFY(QTest::qWaitForWindowExposed(&view));
QQuickText *text = view.rootObject()->findChild<QQuickText*>("textItem");
QVERIFY(text != 0);
diff --git a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
index 7cc9ddb8f2..3bdaf2e9fd 100644
--- a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
+++ b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
@@ -1282,7 +1282,7 @@ void tst_qquicktextinput::horizontalAlignment()
QQuickView window(testFileUrl("horizontalAlignment.qml"));
window.show();
- QTest::qWaitForWindowShown(&window);
+ QVERIFY(QTest::qWaitForWindowExposed(&window));
QObject *ob = window.rootObject();
QVERIFY(ob != 0);
diff --git a/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp b/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
index 2b0459669f..533085bbc7 100644
--- a/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
+++ b/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
@@ -796,7 +796,7 @@ void tst_qquickvisualdatamodel::itemsDestroyed()
view.setSource(source);
view.show();
- QTest::qWaitForWindowShown(&view);
+ QVERIFY(QTest::qWaitForWindowExposed(&view));
QVERIFY(delegate = findItem<QQuickItem>(view.rootItem(), "delegate", 1));
}
diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
index 5866d4a5f3..9800c724b9 100644
--- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
+++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
@@ -869,7 +869,7 @@ void tst_qquickwindow::grab()
window.resize(250, 250);
window.show();
- QTest::qWaitForWindowShown(&window);
+ QVERIFY(QTest::qWaitForWindowExposed(&window));
QImage content = window.grabWindow();
QCOMPARE(content.width(), window.width());
diff --git a/tests/auto/quick/rendernode/tst_rendernode.cpp b/tests/auto/quick/rendernode/tst_rendernode.cpp
index af230f73a5..04338fa351 100644
--- a/tests/auto/quick/rendernode/tst_rendernode.cpp
+++ b/tests/auto/quick/rendernode/tst_rendernode.cpp
@@ -60,7 +60,7 @@ public:
view.setSource(testFileUrl(fileName));
view.show();
- QTest::qWaitForWindowShown(&view);
+ QTest::qWaitForWindowExposed(&view);
return view.grabWindow();
}
--
GitLab