Merge remote-tracking branch 'origin/release' into stable

Conflicts:
	tests/auto/opengl/qgl/tst_qgl.cpp

Change-Id: I3c601351c984c1f4b00478d3c47ac9eeb021e892

1 files changed, 11 insertions, 4 deletions

diff --git a/tests/auto/opengl/qgl/tst_qgl.cpp b/tests/auto/opengl/qgl/tst_qgl.cpp
index 3bae5d5103..00973cf533 100644
--- a/tests/auto/opengl/qgl/tst_qgl.cpp
+++ b/tests/auto/opengl/qgl/tst_qgl.cpp
@@ -832,10 +832,19 @@ static void fuzzyCompareImages(const QImage &testImage, const QImage &referenceI
 class UnclippedWidget : public QWidget
 {
 public:
+    bool painted;
+
+    UnclippedWidget()
+        : painted(false)
+    {
+    }
+
     void paintEvent(QPaintEvent *)
     {
         QPainter p(this);
         p.fillRect(rect().adjusted(-1000, -1000, 1000, 1000), Qt::black);
+
+        painted = true;
     }
 };
 
@@ -866,10 +875,8 @@ void tst_QGL::graphicsViewClipping()
     scene.setSceneRect(view.viewport()->rect());
 
     QVERIFY(QTest::qWaitForWindowExposed(&view));
-    #ifdef Q_OS_MAC
-        // The black rectangle jumps from the center to the upper left for some reason.
-        QTest::qWait(100);
-    #endif
+
+    QTRY_VERIFY(widget->painted);
 
     QImage image = viewport->grabFrameBuffer();
     QImage expected = image;