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, 2 insertions, 7 deletions

diff --git a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
index 9d27b7db08..b3afdb949e 100644
--- a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
+++ b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
@@ -460,9 +460,7 @@ void tst_QItemDelegate::font()
     TestItemDelegate *delegate = new TestItemDelegate(&table);
     table.setItemDelegate(delegate);
     table.show();
-#ifdef Q_WS_X11
-    qt_x11_wait_for_window_manager(&table);
-#endif
+    QVERIFY(QTest::qWaitForWindowExposed(&table));
 
     QTableWidgetItem *item = new QTableWidgetItem;
     item->setText(itemText);
@@ -993,11 +991,8 @@ void tst_QItemDelegate::decoration()
     TestItemDelegate delegate;
     table.setItemDelegate(&delegate);
     table.show();
-#ifdef Q_WS_X11
-    qt_x11_wait_for_window_manager(&table);
-#endif
     QApplication::setActiveWindow(&table);
-    QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget*>(&table));
+    QVERIFY(QTest::qWaitForWindowActive(&table));
 
     QVariant value;
     switch ((QVariant::Type)type) {