diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-09-06 16:44:59 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-07 08:36:21 +0200 |
| commit | 6119d12d7d7d63b00891e7fa21a5fab6751fb062 (patch) | |
| tree | cde6a0b93fca880ac27f1e43a177c12ccca4734b /tests | |
| parent | 3883b4f5b1a55922bdbe4e69109ff1f6b7f8277d (diff) | |
Fixed tst_QGL::partialGLWidgetUpdates.
Change-Id: Ie37051e28b199b5d159f5be05be41efbd17fdf08
Reviewed-on: http://codereview.qt.nokia.com/4273
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qgl/tst_qgl.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/tests/auto/qgl/tst_qgl.cpp b/tests/auto/qgl/tst_qgl.cpp index e3a8500bda..e1c3462560 100644 --- a/tests/auto/qgl/tst_qgl.cpp +++ b/tests/auto/qgl/tst_qgl.cpp @@ -919,9 +919,7 @@ void tst_QGL::partialGLWidgetUpdates() widget.setFixedSize(150, 150); widget.setAutoFillBackground(autoFillBackground); widget.show(); -#ifdef Q_WS_X11 - qt_x11_wait_for_window_manager(&widget); -#endif + QTest::qWait(200); if (widget.format().doubleBuffer() != doubleBufferedContext) @@ -929,10 +927,7 @@ void tst_QGL::partialGLWidgetUpdates() widget.paintEventRegion = QRegion(); widget.repaint(50, 50, 50, 50); -#ifdef Q_WS_MAC - // repaint() is not immediate on the Mac; it has to go through the event loop. - QTest::qWait(200); -#endif + if (supportsPartialUpdates) QCOMPARE(widget.paintEventRegion, QRegion(50, 50, 50, 50)); else |