diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-07-18 13:12:59 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-20 09:27:28 +0200 |
| commit | 87618403976aa82450895da6196a944195980de7 (patch) | |
| tree | 906d035678d8a31e57a94c01e8756b0085b3e1e4 /tests/auto/widgets/widgets/qtoolbar | |
| parent | c081107206cb1d31415539c4429f7896b997cf71 (diff) | |
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>
Diffstat (limited to 'tests/auto/widgets/widgets/qtoolbar')
| -rw-r--r-- | tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp b/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp index f4fb6a9bcd..a7db9a01f7 100644 --- a/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp +++ b/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp @@ -529,9 +529,7 @@ void tst_QToolBar::actionGeometry() tb.addAction(&action4); tb.show(); -#ifdef Q_WS_X11 - qt_x11_wait_for_window_manager(&tb); -#endif + QVERIFY(QTest::qWaitForWindowExposed(&tb)); QList<QToolBarExtension *> extensions = tb.findChildren<QToolBarExtension *>(); @@ -853,9 +851,7 @@ void tst_QToolBar::actionTriggered() tb.addAction(&action4); tb.show(); -#ifdef Q_WS_X11 - qt_x11_wait_for_window_manager(&tb); -#endif + QVERIFY(QTest::qWaitForWindowExposed(&tb)); QList<QToolBarExtension *> extensions = tb.findChildren<QToolBarExtension *>(); |