From 6119d12d7d7d63b00891e7fa21a5fab6751fb062 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20R=C3=B8dal?= Date: Tue, 6 Sep 2011 16:44:59 +0200 Subject: Fixed tst_QGL::partialGLWidgetUpdates. Change-Id: Ie37051e28b199b5d159f5be05be41efbd17fdf08 Reviewed-on: http://codereview.qt.nokia.com/4273 Reviewed-by: Qt Sanity Bot Reviewed-by: Gunnar Sletta --- tests/auto/qgl/tst_qgl.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'tests') 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 -- cgit v1.2.3