summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorDenis Dzyubenko <denis.dzyubenko@nokia.com>2010-02-04 12:55:36 (GMT)
committerDenis Dzyubenko <denis.dzyubenko@nokia.com>2010-02-04 15:04:56 (GMT)
commit555d5b7a87b8c3a2f207c93c7eda30892de5ecc6 (patch)
treefbc5cb910b83c524e2e8a10119937d7322e803f0 /tests/auto
parent030c620e9f3f4e86b77a69e77a604a0c1e946229 (diff)
downloadQt-555d5b7a87b8c3a2f207c93c7eda30892de5ecc6.zip
Qt-555d5b7a87b8c3a2f207c93c7eda30892de5ecc6.tar.gz
Qt-555d5b7a87b8c3a2f207c93c7eda30892de5ecc6.tar.bz2
Changed qgraphicswidget autotest to use qWaitForWindowShown.
Make use of (yet another time) improved QTest::qWaitForWindowShown. Reviewed-by: trustme
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
index a7195c4..2bf1521 100644
--- a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
+++ b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
@@ -2919,11 +2919,9 @@ void tst_QGraphicsWidget::initialShow2()
scene.addItem(widget);
QGraphicsView view(&scene);
+ view.setWindowFlags(Qt::X11BypassWindowManagerHint);
view.show();
- // Not using QTest::qWaitForWindowShown(&view); on purpose, because there's
- // a bug in qt_x11_wait_for_window_manager that prevents this test
- // to pass. Denis is looking into it.
- QTest::qWait(300);
+ QTest::qWaitForWindowShown(&view);
QCOMPARE(widget->repaints, expectedRepaintCount);
}