diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-10-05 21:44:05 +0200 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-10-05 21:44:55 +0200 |
| commit | c7b091351d6fdf5fda5f38a94af24a395252249f (patch) | |
| tree | d6be6ee3261dd3e899094e54faddbfdcbc73baf7 /tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp | |
| parent | 8cac1e7fe5bfda7e876d03d1407f616f89bd74f8 (diff) | |
| download | qt4-tools-c7b091351d6fdf5fda5f38a94af24a395252249f.tar.gz | |
Stabilize tests on X11
Diffstat (limited to 'tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp')
| -rw-r--r-- | tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp index e2e8c5f0f6..edea6b8fbe 100644 --- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp @@ -6444,14 +6444,12 @@ void tst_QGraphicsItem::nestedClipping() QGraphicsView view(&scene); view.setOptimizationFlag(QGraphicsView::IndirectPainting); view.show(); -#ifdef Q_WS_X11 - qt_x11_wait_for_window_manager(&view); -#endif - QTest::qWait(250); + QTest::qWaitForWindowShown(&view); + QTest::qWait(25); QList<QGraphicsItem *> expected; expected << root << l1 << l2 << l3; - QCOMPARE(scene.drawnItems, expected); + QTRY_COMPARE(scene.drawnItems, expected); QImage image(200, 200, QImage::Format_ARGB32_Premultiplied); image.fill(0); |