Deprecate the qWaitForWindowShown(QWindow *) method.

While the qWaitForWindowShown(QWidget *) is inherited
from Qt 4.8, the qWaitForWindowShown(QWindow *) was introduced
in Qt 5. As it is identical to qWaitForWindowExposed()
and removed already, it can be deprecated in Qt 5.

Remove its usages in qtbase.

Change-Id: I28788d120ad687a49f02b2b44de6b38a2832fe5c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>

2 files changed, 19 insertions, 21 deletions

diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
index 1c5702d15f..7299e2ad8b 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
@@ -1078,7 +1078,7 @@ void tst_QGraphicsScene::addItem()
         CustomView view;
         view.setScene(&scene);
         view.show();
-        QTest::qWaitForWindowShown(view.windowHandle());
+        QVERIFY(QTest::qWaitForWindowExposed(&view));
         qApp->processEvents();
         view.repaints = 0;
 
@@ -1606,10 +1606,9 @@ void tst_QGraphicsScene::hoverEvents_siblings()
     view.rotate(10);
     view.scale(1.7, 1.7);
     view.show();
-    QTest::qWaitForWindowShown(view.windowHandle());
     qApp->setActiveWindow(&view);
     view.activateWindow();
-    QTest::qWait(70);
+    QVERIFY(QTest::qWaitForWindowActive(&view));
 
     QCursor::setPos(view.mapToGlobal(QPoint(-5, -5)));
 
@@ -2737,8 +2736,8 @@ void tst_QGraphicsScene::contextMenuEvent()
 
     QGraphicsView view(&scene);
     view.show();
-    QTest::qWaitForWindowShown(view.windowHandle());
     view.activateWindow();
+    QVERIFY(QTest::qWaitForWindowActive(&view));
     view.centerOn(item);
 
     {
@@ -2771,7 +2770,7 @@ void tst_QGraphicsScene::contextMenuEvent_ItemIgnoresTransformations()
     QGraphicsView view(&scene, &topLevel);
     view.resize(200, 200);
     topLevel.show();
-    QTest::qWaitForWindowShown(topLevel.windowHandle());
+    QVERIFY(QTest::qWaitForWindowExposed(&topLevel));
 
     {
         QPoint pos(50, 50);
diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
index c9d8b3162e..1b4cacf91c 100644
--- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
+++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
@@ -1645,8 +1645,7 @@ void tst_QWidget::setTabOrder()
     container.show();
     container.activateWindow();
     qApp->setActiveWindow(&container);
-    QTest::qWaitForWindowShown(container.windowHandle());
-    QTest::qWait(100);
+    QVERIFY(QTest::qWaitForWindowActive(&container));
 
     QTRY_VERIFY(lastEdit->hasFocus());
     container.tab();
@@ -3085,7 +3084,7 @@ void tst_QWidget::restoreVersion1Geometry()
         widgetToSave.move(expectedPosition);
         widgetToSave.resize(expectedSize);
         widgetToSave.show();
-        QTest::qWaitForWindowShown(widget.windowHandle());
+        QVERIFY(QTest::qWaitForWindowExposed(&widget));
         QTest::qWait(500); // stabilize
         widgetToSave.setWindowState(Qt::WindowStates(expectedWindowState));
         QTest::qWait(500); // stabilize
@@ -4768,7 +4767,7 @@ void tst_QWidget::popupEnterLeave()
 
     parent.show();
 
-    QTest::qWaitForWindowShown(parent.windowHandle());
+    QVERIFY(QTest::qWaitForWindowExposed(&parent));
 
     QWindowSystemInterface::handleMouseEvent(parent.windowHandle(), QPointF(5, 5), QPointF(), Qt::LeftButton, Qt::NoModifier);
     QTest::qWait(100);
@@ -4788,7 +4787,7 @@ void tst_QWidget::popupEnterLeave()
 
     popup.show();
 
-    QTest::qWaitForWindowShown(popup.windowHandle());
+    QVERIFY(QTest::qWaitForWindowExposed(&popup));
 
     QTest::qWait(100);
 
@@ -5491,7 +5490,7 @@ void tst_QWidget::minAndMaxSizeWithX11BypassWindowManagerHint()
     QCOMPARE(widget.size(), newMaximumSize);
 
     widget.show();
-    QTest::qWaitForWindowShown(widget.windowHandle());
+    QVERIFY(QTest::qWaitForWindowExposed(&widget));
     QCOMPARE(widget.size(), newMaximumSize);
     }
 
@@ -5503,7 +5502,7 @@ void tst_QWidget::minAndMaxSizeWithX11BypassWindowManagerHint()
     QCOMPARE(widget.size(), newMinimumSize);
 
     widget.show();
-    QTest::qWaitForWindowShown(widget.windowHandle());
+    QVERIFY(QTest::qWaitForWindowExposed(&widget));
     QCOMPARE(widget.size(), newMinimumSize);
     }
 }
@@ -6909,7 +6908,7 @@ void tst_QWidget::moveWindowInShowEvent()
 
     // show it
     widget.show();
-    QTest::qWaitForWindowShown(widget.windowHandle());
+    QVERIFY(QTest::qWaitForWindowShown(&widget));
     QTest::qWait(100);
     // it should have moved
     QCOMPARE(widget.pos(), position);
@@ -7052,7 +7051,7 @@ void tst_QWidget::alienWidgets()
     QWidget greatGrandChild(&grandChild);
     parent.show();
 
-    QTest::qWaitForWindowShown(parent.windowHandle());
+    QVERIFY(QTest::qWaitForWindowExposed(&parent));
 
     // Verify that the WA_WState_Created attribute is set
     // and the top-level is the only native window.
@@ -7501,7 +7500,7 @@ void tst_QWidget::sendUpdateRequestImmediately()
     UpdateWidget updateWidget;
     updateWidget.show();
 
-    QTest::qWaitForWindowShown(updateWidget.windowHandle());
+    QVERIFY(QTest::qWaitForWindowExposed(&updateWidget));
 
     qApp->processEvents();
     updateWidget.reset();
@@ -7586,7 +7585,7 @@ void tst_QWidget::opaqueChildren()
     greatGrandChild.setAutoFillBackground(true); // Opaque child widget.
 
     widget.show();
-    QTest::qWaitForWindowShown(widget.windowHandle());
+    QVERIFY(QTest::qWaitForWindowExposed(&widget));
     QTest::qWait(100);
 
     // Child, grandChild and greatGrandChild are outside the ancestor clip.
@@ -7740,7 +7739,7 @@ void tst_QWidget::immediateRepaintAfterInvalidateBuffer()
 
     QWidget *widget = new UpdateWidget;
     widget->show();
-    QTest::qWaitForWindowShown(widget->windowHandle());
+    QVERIFY(QTest::qWaitForWindowExposed(widget));
     QTest::qWait(200);
 
     static_cast<UpdateWidget *>(widget)->numPaintEvents = 0;
@@ -8097,7 +8096,7 @@ void tst_QWidget::translucentWidget()
     const QPoint labelPos = qApp->desktop()->availableGeometry().topLeft();
     label.move(labelPos);
     label.show();
-    QTest::qWaitForWindowShown(label.windowHandle());
+    QVERIFY(QTest::qWaitForWindowExposed(&label));
     QTest::qWait(200);
 
     QPixmap widgetSnapshot;
@@ -8484,7 +8483,7 @@ void tst_QWidget::syntheticEnterLeave()
     window.show();
     window.raise();
 
-    QTest::qWaitForWindowShown(window.windowHandle());
+    QVERIFY(QTest::qWaitForWindowExposed(&window));
     QTest::qWait(300);
 
 #define RESET_EVENT_COUNTS \
@@ -8587,7 +8586,7 @@ void tst_QWidget::taskQTBUG_4055_sendSyntheticEnterLeave()
      SELChild child(&parent);
      child.resize(200, 200);
      parent.show();
-     QTest::qWaitForWindowShown(parent.windowHandle());
+     QVERIFY(QTest::qWaitForWindowExposed(&parent));
      QTest::qWait(150);
 
      QCursor::setPos(child.mapToGlobal(QPoint(100, 100)));
@@ -8689,7 +8688,7 @@ void tst_QWidget::updateOnDestroyedSignal()
     child->setPalette(Qt::red);
 
     widget.show();
-    QTest::qWaitForWindowShown(widget.windowHandle());
+    QVERIFY(QTest::qWaitForWindowExposed(&widget));
     QTest::qWait(200);
 
     // Please do not crash.