1 files changed, 31 insertions, 17 deletions

diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
index 474ac47ea1..d2b7001e93 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
@@ -542,6 +542,7 @@ void tst_QGraphicsView::sceneRect()
     QCOMPARE(view.sceneRect(), QRectF());
     QGraphicsScene scene;
     QGraphicsRectItem *item = scene.addRect(QRectF(-100, -100, 100, 100));
+    item->setPen(QPen(Qt::black, 0));
 
     view.setScene(&scene);
 
@@ -1510,6 +1511,7 @@ void tst_QGraphicsView::itemsInRect_cosmeticAdjust()
 
     QGraphicsScene scene(-100, -100, 200, 200);
     CountPaintItem *rect = new CountPaintItem(QRectF(-50, -50, 100, 100));
+    rect->setPen(QPen(Qt::black, 0));
     scene.addItem(rect);
 
     QGraphicsView view(&scene);
@@ -2603,8 +2605,13 @@ void tst_QGraphicsView::optimizationFlags_dontSavePainterState2()
 
     MyScene scene;
     // Add transformed dummy items to make sure the painter's worldTransform() is changed in drawItems.
-    scene.addRect(0, 0, 20, 20)->setTransform(QTransform::fromScale(2, 2));
-    scene.addRect(50, 50, 20, 20)->setTransform(QTransform::fromTranslate(200, 200));
+    QGraphicsRectItem *rectA = scene.addRect(0, 0, 20, 20);
+    QGraphicsRectItem *rectB = scene.addRect(50, 50, 20, 20);
+
+    rectA->setTransform(QTransform::fromScale(2, 2));
+    rectA->setPen(QPen(Qt::black, 0));
+    rectB->setTransform(QTransform::fromTranslate(200, 200));
+    rectB->setPen(QPen(Qt::black, 0));
 
     foreach (QGraphicsItem *item, scene.items())
         item->setOpacity(0.6);
@@ -3367,10 +3374,11 @@ void tst_QGraphicsView::moveItemWhileScrolling()
             setScene(new QGraphicsScene(0, 0, 1000, 1000));
             rect = scene()->addRect(0, 0, 10, 10);
             rect->setPos(50, 50);
+            rect->setPen(QPen(Qt::black, 0));
             painted = false;
         }
         QRegion lastPaintedRegion;
-        QGraphicsItem *rect;
+        QGraphicsRectItem *rect;
         bool painted;
         void waitForPaintEvent()
         {
@@ -4331,25 +4339,31 @@ void tst_QGraphicsView::task255529_transformationAnchorMouseAndViewportMargins()
     view.show();
     qApp->setActiveWindow(&view);
     QVERIFY(QTest::qWaitForWindowActive(&view));
-    QPoint mouseViewPos(20, 20);
-    sendMouseMove(view.viewport(), mouseViewPos);
+    // This is highly unstable (observed to pass on Windows and some Linux configurations).
+#ifndef Q_OS_MAC
+    for (int i = 0; i < 4; ++i) {
+        QPoint mouseViewPos(20, 20);
+        sendMouseMove(view.viewport(), mouseViewPos);
 
-    QPointF mouseScenePos = view.mapToScene(mouseViewPos);
-    view.setTransform(QTransform().scale(5, 5).rotate(5, Qt::ZAxis), true);
+        QPointF mouseScenePos = view.mapToScene(mouseViewPos);
+        view.setTransform(QTransform().scale(5, 5).rotate(5, Qt::ZAxis), true);
 
-    QPointF newMouseScenePos = view.mapToScene(mouseViewPos);
+        qreal slack = 1;
 
-    qreal slack = 1;
+        QPointF newMouseScenePos = view.mapToScene(mouseViewPos);
 
-    const qreal dx = qAbs(newMouseScenePos.x() - mouseScenePos.x());
-    const qreal dy = qAbs(newMouseScenePos.y() - mouseScenePos.y());
-    const QByteArray message = QString::fromLatin1("QTBUG-22455, distance: dx=%1, dy=%2 slack=%3 (%4).").
-                     arg(dx).arg(dy).arg(slack).arg(qApp->style()->metaObject()->className()).toLocal8Bit();
-    // This is highly unstable (observed to pass on Windows and some Linux configurations).
-#ifdef Q_OS_MAC
-    QEXPECT_FAIL("", message.constData(), Abort);
+        const qreal dx = qAbs(newMouseScenePos.x() - mouseScenePos.x());
+        const qreal dy = qAbs(newMouseScenePos.y() - mouseScenePos.y());
+        const QByteArray message = QString::fromLatin1("QTBUG-22455, distance: dx=%1, dy=%2 slack=%3 (%4).").
+                         arg(dx).arg(dy).arg(slack).arg(qApp->style()->metaObject()->className()).toLocal8Bit();
+        if (i == 9 || (dx < slack && dy < slack)) {
+            QVERIFY2(dx < slack && dy < slack, message.constData());
+            break;
+        }
+
+        QTest::qWait(100);
+    }
 #endif
-    QVERIFY2(dx < slack && dy < slack, message.constData());
 }
 
 void tst_QGraphicsView::task259503_scrollingArtifacts()