diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-08-28 13:51:22 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-08-28 13:51:22 (GMT) |
| commit | 31a0ef1d1dd55096652c1c4f0501fce2937a1b23 (patch) | |
| tree | f728a2e5829e26ed75bfd465d07b336fc77e599f /tests/auto/qgl/tst_qgl.cpp | |
| parent | 7c2620578ba0698a14c1d4ff5c7a4e260f06ad31 (diff) | |
| parent | bd3cd571ac061b0ed0e8c001c90c4edeafae67d7 (diff) | |
| download | Qt-31a0ef1d1dd55096652c1c4f0501fce2937a1b23.zip Qt-31a0ef1d1dd55096652c1c4f0501fce2937a1b23.tar.gz Qt-31a0ef1d1dd55096652c1c4f0501fce2937a1b23.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'tests/auto/qgl/tst_qgl.cpp')
| -rw-r--r-- | tests/auto/qgl/tst_qgl.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/qgl/tst_qgl.cpp b/tests/auto/qgl/tst_qgl.cpp index 8958530..ae31572 100644 --- a/tests/auto/qgl/tst_qgl.cpp +++ b/tests/auto/qgl/tst_qgl.cpp @@ -664,7 +664,7 @@ void tst_QGL::glWidgetRendering() QTest::qWait(200); QVERIFY(w.beginOk); - QVERIFY(w.engineType == QPaintEngine::OpenGL); + QVERIFY(w.engineType == QPaintEngine::OpenGL || w.engineType == QPaintEngine::OpenGL2); QImage fb = w.grabFrameBuffer(false).convertToFormat(QImage::Format_RGB32); QImage reference(fb.size(), QImage::Format_RGB32); @@ -697,7 +697,7 @@ void tst_QGL::glWidgetReparent() qt_x11_wait_for_window_manager(widget); qt_x11_wait_for_window_manager(&parentWidget); #endif - QTest::qWait(2000); + QTest::qWait(200); QVERIFY(parentWidget.children().count() == 1); // The layout @@ -707,7 +707,7 @@ void tst_QGL::glWidgetReparent() #ifdef Q_WS_X11 qt_x11_wait_for_window_manager(&parentWidget); #endif - QTest::qWait(2000); + QTest::qWait(200); QVERIFY(parentWidget.children().count() == 2); // Layout & glwidget QVERIFY(parentWidget.children().contains(widget)); @@ -718,7 +718,7 @@ void tst_QGL::glWidgetReparent() #ifdef Q_WS_X11 qt_x11_wait_for_window_manager(&parentWidget); #endif - QTest::qWait(2000); + QTest::qWait(200); QVERIFY(parentWidget.children().count() == 1); // The layout @@ -730,7 +730,7 @@ void tst_QGL::glWidgetReparent() #ifdef Q_WS_X11 qt_x11_wait_for_window_manager(&parentWidget); #endif - QTest::qWait(2000); + QTest::qWait(200); QVERIFY(parentWidget.children().count() == 2); // Layout & glwidget QVERIFY(parentWidget.children().contains(widget)); |