diff options
author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2010-02-04 16:54:24 (GMT) |
---|---|---|
committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2010-02-04 16:54:24 (GMT) |
commit | e2f439d8ff3529d9ef50ac58da61432627a8f350 (patch) | |
tree | cad2dc939ef56f34c8bfc75bdbde9f637f4ea79a /tests/auto | |
parent | 39bbc477e418d4d34c2f44fd10e76950a1ae781d (diff) | |
download | Qt-e2f439d8ff3529d9ef50ac58da61432627a8f350.zip Qt-e2f439d8ff3529d9ef50ac58da61432627a8f350.tar.gz Qt-e2f439d8ff3529d9ef50ac58da61432627a8f350.tar.bz2 |
Cleanup after "Changed qgraphicswidget autotest to use qWaitForWindowShown"
Commit: 555d5b7a87b8c3a2f207c93c7eda30892de5ecc6
We also have to do the same for the "dummyView".
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp index 2bf1521..00bf144 100644 --- a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp +++ b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp @@ -2901,12 +2901,10 @@ void tst_QGraphicsWidget::initialShow2() dummyScene.addItem(new QGraphicsRectItem(0, 0, 100, 100)); QGraphicsView *dummyView = new QGraphicsView(&dummyScene); + dummyView->setWindowFlags(Qt::X11BypassWindowManagerHint); EventSpy paintSpy(dummyView->viewport(), QEvent::Paint); dummyView->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(dummyView); const int expectedRepaintCount = paintSpy.count(); delete dummyView; dummyView = 0; |