summaryrefslogtreecommitdiffstats
path: root/tests/auto/qgraphicsproxywidget
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-09-22 18:56:24 +0200
committerOlivier Goffart <ogoffart@trolltech.com>2009-09-22 18:57:11 +0200
commitf5d6022f4ca4af32de2b683dfb9f41173e7c8934 (patch)
treef573bdfe72a6bee62372d46e624b118fa26c6558 /tests/auto/qgraphicsproxywidget
parent0691350e14632dea6c12a2d37e605dc0628b4ceb (diff)
Stabilize more test
Diffstat (limited to 'tests/auto/qgraphicsproxywidget')
-rw-r--r--tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp13
1 files changed, 4 insertions, 9 deletions
diff --git a/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
index 32b44203bc..a2892571ea 100644
--- a/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
+++ b/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
@@ -1295,9 +1295,7 @@ void tst_QGraphicsProxyWidget::paintEvent()
QGraphicsScene scene;
QGraphicsView view(&scene);
view.show();
-#ifdef Q_WS_X11
- qt_x11_wait_for_window_manager(&view);
-#endif
+ QTest::qWaitForWindowShown(&view);
SubQGraphicsProxyWidget proxy;
@@ -1306,9 +1304,8 @@ void tst_QGraphicsProxyWidget::paintEvent()
//this bug prevents the widget from being updated
w->show();
-#ifdef Q_WS_X11
- qt_x11_wait_for_window_manager(w);
-#endif
+ QTest::qWaitForWindowShown(w);
+
QTest::qWait(100);
proxy.setWidget(w);
@@ -2719,9 +2716,7 @@ void tst_QGraphicsProxyWidget::windowOpacity()
QGraphicsProxyWidget *proxy = scene.addWidget(widget);
proxy->setCacheMode(QGraphicsItem::ItemCoordinateCache);
view.show();
-#ifdef Q_WS_X11
- qt_x11_wait_for_window_manager(&view);
-#endif
+ QTest::qWaitForWindowShown(&view);
QApplication::sendPostedEvents();
QTest::qWait(100);