diff options
| author | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-08-28 09:45:43 (GMT) |
|---|---|---|
| committer | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-08-28 09:50:15 (GMT) |
| commit | 5fa9d11e31edb7aeed9012e4042a5b1a899554c7 (patch) | |
| tree | b61ff80af6fc9dcd4e2dc8213b2df3d17a25b8a2 | |
| parent | cb7d80f998804c451508c3044cefa386778b0e88 (diff) | |
| download | Qt-5fa9d11e31edb7aeed9012e4042a5b1a899554c7.zip Qt-5fa9d11e31edb7aeed9012e4042a5b1a899554c7.tar.gz Qt-5fa9d11e31edb7aeed9012e4042a5b1a899554c7.tar.bz2 | |
Fix QtOpenGL autotest
The GL2 paint engine now has it's own class ID. This patch also reduces
the excessive 2000ms delays to 200ms. :-)
Reviewed-by: Trustme
| -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)); |