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/qformlayout/tst_qformlayout.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp') diff --git a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp index fc47e09d4f..8ec0ef8a5f 100644 --- a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp +++ b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp @@ -348,9 +348,7 @@ void tst_QFormLayout::contentsRect() w.setLayout(&form); form.addRow("Label", 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; form.getContentsMargins(&l, &t, &r, &b); QRect geom = form.geometry(); -- cgit v1.2.3