From 87618403976aa82450895da6196a944195980de7 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 18 Jul 2012 13:12:59 +0200 Subject: 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 --- tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp') diff --git a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp index 6b424ab4b4..be2d49ab7e 100644 --- a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp +++ b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp @@ -906,10 +906,7 @@ void tst_QGridLayout::minMaxSize() } m_toplevel->show(); -#if defined(Q_WS_X11) - qt_x11_wait_for_window_manager(m_toplevel); // wait for the show -#endif - QTest::qWait(40); + QVERIFY(QTest::qWaitForWindowExposed(m_toplevel)); m_toplevel->adjustSize(); QTest::qWait(240); // wait for the implicit adjustSize // If the following fails we might have to wait longer. @@ -1462,9 +1459,7 @@ void tst_QGridLayout::layoutSpacingImplementation() widget->setParent(&toplevel); widget->resize(widget->sizeHint()); toplevel.show(); -#ifdef Q_WS_X11 - qt_x11_wait_for_window_manager(&toplevel); // wait for the show -#endif + QVERIFY(QTest::qWaitForWindowExposed(&toplevel)); QLayout *layout = widget->layout(); QVERIFY(layout); @@ -1586,9 +1581,7 @@ void tst_QGridLayout::contentsRect() w.setLayout(&grid); grid.addWidget(new QPushButton(&w)); w.show(); -#if defined(Q_WS_X11) - qt_x11_wait_for_window_manager(&w); // wait for the show -#endif + QVERIFY(QTest::qWaitForWindowExposed(&w)); int l, t, r, b; grid.getContentsMargins(&l, &t, &r, &b); QRect geom = grid.geometry(); -- cgit v1.2.3