Implement waitForWindowExposed and friends for widget windows.

- Implement waitForWindowExposed() for toplevel windows.
- Implement waitForWindowShown(QWidget *) and mark as
  deprecated in line with waitForWindowShown(QWindow*).
- Use in tests.
- Simplify tests (collapse waitForExposed, setActive
  into setActiveWindow, waitForActive), remove most
  hard-coded timeouts.
- Stabilize graphicsview tests by using waitForWindowActive.

Change-Id: Ic7c061e2745b36f71a715ee4e47c0346b11a91e8
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>

1 files changed, 4 insertions, 5 deletions

diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
index 320483bb14..f61b776106 100644
--- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
+++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
@@ -3360,9 +3360,8 @@ void tst_QTreeView::task224091_appendColumns()
     treeView->setModel(model);
     topLevel->show();
     treeView->resize(50,50);
-
-    QTest::qWaitForWindowShown(treeView);
-    qApp->processEvents();
+    qApp->setActiveWindow(topLevel);
+    QVERIFY(QTest::qWaitForWindowActive(topLevel));
 
     QList<QStandardItem *> projlist;
     for (int k = 0; k < 10; ++k)
@@ -3846,8 +3845,8 @@ void tst_QTreeView::keyboardNavigationWithDisabled()
     view.resize(200, view.visualRect(model.index(0,0)).height()*10);
     topLevel.show();
     QApplication::setActiveWindow(&topLevel);
-    QTest::qWaitForWindowShown(&topLevel);
-    QTRY_VERIFY(topLevel.isActiveWindow());
+    QVERIFY(QTest::qWaitForWindowActive(&topLevel));
+    QVERIFY(topLevel.isActiveWindow());
 
     view.setCurrentIndex(model.index(1, 0));
     QTest::keyClick(view.viewport(), Qt::Key_Up);