summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/kernel/qapplication
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2012-07-30 12:36:02 +0200
committerQt by Nokia <qt-info@nokia.com>2012-08-01 13:26:03 +0200
commit305cdc7355c4b021cfe54c710aa92a88e12fe188 (patch)
tree0d141f080278556d3ed454f92a5cba6012a2a5b4 /tests/auto/widgets/kernel/qapplication
parent0838ac541d38b33b23955c036bbcfd94ccc19066 (diff)
Remove usage of deprecated qWaitForWindowShown(QWidget *) method.
Change-Id: I445d24a09dbb7abb62a37bd9914284f21a4f08f1 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/widgets/kernel/qapplication')
-rw-r--r--tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
index 610c0bcba2..2df89c076b 100644
--- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
+++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
@@ -765,7 +765,7 @@ public:
messageBox->setDefaultButton(QMessageBox::Save);
messageBox->show();
- QTest::qWaitForWindowShown(messageBox);
+ QVERIFY(QTest::qWaitForWindowExposed(messageBox));
// verify that all windows are visible
foreach (QWidget *w, qApp->topLevelWidgets())
@@ -797,7 +797,7 @@ void tst_QApplication::closeAllWindows()
// show all windows
foreach (QWidget *w, app.topLevelWidgets()) {
w->show();
- QTest::qWaitForWindowShown(w);
+ QVERIFY(QTest::qWaitForWindowExposed(w));
}
// verify that they are visible
foreach (QWidget *w, app.topLevelWidgets())
@@ -815,7 +815,7 @@ void tst_QApplication::closeAllWindows()
// show all windows
foreach (QWidget *w, app.topLevelWidgets()) {
w->show();
- QTest::qWaitForWindowShown(w);
+ QVERIFY(QTest::qWaitForWindowExposed(w));
}
// close the last window to open the prompt (eventloop recurses)
promptOnCloseWidget->close();
@@ -1917,7 +1917,7 @@ void tst_QApplication::touchEventPropagation()
window.show(); // Must have an explicitly specified QWindow for handleTouchEvent,
// passing 0 would result in using topLevelAt() which is not ok in this case
// as the screen position in the point is bogus.
- QTest::qWaitForWindowShown(&window);
+ QVERIFY(QTest::qWaitForWindowExposed(&window));
// QPA always takes screen positions and since we map the TouchPoint back to QPA's structure first,
// we must ensure there is a screen position in the TouchPoint that maps to a local 0, 0.
pressedTouchPoints[0].setScreenPos(window.mapToGlobal(QPoint(0, 0)));
@@ -1971,7 +1971,7 @@ void tst_QApplication::touchEventPropagation()
TouchEventPropagationTestWidget widget(&window);
widget.setObjectName("2. widget");
window.show();
- QTest::qWaitForWindowShown(&window);
+ QVERIFY(QTest::qWaitForWindowExposed(&window));
pressedTouchPoints[0].setScreenPos(window.mapToGlobal(QPoint(0, 0)));
releasedTouchPoints[0].setScreenPos(window.mapToGlobal(QPoint(0, 0)));