diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2012-01-17 14:43:47 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-23 09:32:58 +0100 |
| commit | 37167e34204439731c380a94d4e8bc63fea82e45 (patch) | |
| tree | 94941822febb2b7f4fb9853da76fee7df2620294 | |
| parent | 34b3336866a1a959493225e456925ac7a918a169 (diff) | |
Fix XPASS in tst_QGraphicsView on Mac OS X
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>
| -rw-r--r-- | tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp index 5a7fe314a8..0172648962 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp @@ -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); } } |