Fix XPASS in tst_QGraphicsView on Mac OS X
authorBradley T. Hughes <bradley.hughes@nokia.com>
Tue, 17 Jan 2012 13:43:47 +0000 (14:43 +0100)
committerQt by Nokia <qt-info@nokia.com>
Mon, 23 Jan 2012 08:32:58 +0000 (09:32 +0100)
These tests now fail with XPASS on Mac OS X, so remove/skip the
QEXPECTED_FAIL(). Unfortunately we don't know which commit fixed this.

Change-Id: Id919a2c9d56fd7c4dee8ccb8aa3293efdce603b2
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp

index 5a7fe31..0172648 100644 (file)
@@ -3361,9 +3361,6 @@ void tst_QGraphicsView::moveItemWhileScrolling()
     int a = adjustForAntialiasing ? 2 : 1;
     expectedRegion += QRect(40, 50, 10, 10).adjusted(-a, -a, a, a);
     expectedRegion += QRect(40, 60, 10, 10).adjusted(-a, -a, a, a);
-#ifdef Q_OS_MAC
-    QEXPECT_FAIL("", "This will fail with Cocoa because paint events are not send in the order expected by graphicsview", Continue);
-#endif
     COMPARE_REGIONS(view.lastPaintedRegion, expectedRegion);
 }
 
@@ -4319,7 +4316,9 @@ void tst_QGraphicsView::task259503_scrollingArtifacts()
             {
 //                qDebug() << event->region();
 //                qDebug() << updateRegion;
+#ifndef Q_OS_MAC
                 QEXPECT_FAIL("", "The event region doesn't include the original item position region. See QTBUG-4416", Continue);
+#endif
                 QCOMPARE(event->region(), updateRegion);
             }
         }