summaryrefslogtreecommitdiffstats
path: root/tests/auto/qmdisubwindow
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-10-06 08:15:42 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2009-10-06 08:16:41 (GMT)
commitf18ea32865521e21f47ea2745181e0e70db0266f (patch)
tree67494a648c687724869e1a3a219d72bb6f675a8c /tests/auto/qmdisubwindow
parent146988463cc0d03be415aa8ff07031b6bcf27975 (diff)
downloadQt-f18ea32865521e21f47ea2745181e0e70db0266f.zip
Qt-f18ea32865521e21f47ea2745181e0e70db0266f.tar.gz
Qt-f18ea32865521e21f47ea2745181e0e70db0266f.tar.bz2
Stabilize tests on X11
Diffstat (limited to 'tests/auto/qmdisubwindow')
-rw-r--r--tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp b/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp
index 8258e15..b556b87 100644
--- a/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp
+++ b/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp
@@ -1003,9 +1003,9 @@ void tst_QMdiSubWindow::setSystemMenu()
mainWindow.setCentralWidget(mdiArea);
mainWindow.menuBar();
mainWindow.show();
-#ifdef Q_WS_X11
- qt_x11_wait_for_window_manager(&mainWindow);
-#endif
+ QTest::qWaitForWindowShown(&mainWindow);
+ QTest::qWait(60);
+
QTRY_VERIFY(subWindow->isVisible());
QPoint globalPopupPos;