summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorRichard Moe Gustavsen <richard.gustavsen@nokia.com>2011-06-29 11:39:31 (GMT)
committerRichard Moe Gustavsen <richard.gustavsen@nokia.com>2011-06-29 11:39:31 (GMT)
commita4b4f2a5491b3df9cbe0c70616645bf0136520e0 (patch)
treedf2f688f2bc51124064e5c18a68cc5ed4406f776 /tests/auto
parentf1f37995238fd6b7dc5b65f6b2f9279021d4363d (diff)
downloadQt-a4b4f2a5491b3df9cbe0c70616645bf0136520e0.zip
Qt-a4b4f2a5491b3df9cbe0c70616645bf0136520e0.tar.gz
Qt-a4b4f2a5491b3df9cbe0c70616645bf0136520e0.tar.bz2
Cocoa: Fix qgraphicsproxywidget auto test
This test fails for CoreGraphics graphics engine on Cocoa. The reason is that we less control over when Cocoa sends us updates, and the size of the region it tells us to update. Rev-By: msorvig
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
index 29c6591..8c52bb8 100644
--- a/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
+++ b/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
@@ -1498,6 +1498,10 @@ void tst_QGraphicsProxyWidget::scrollUpdate()
view.paintEventRegion = QRegion();
view.npaints = 0;
QTimer::singleShot(0, widget, SLOT(updateScroll()));
+#if defined(QT_MAC_USE_COCOA)
+ if (QApplicationPrivate::graphics_system_name != QLatin1String("raster"))
+ QEXPECT_FAIL(0, "Cocoa will send us one aggregated update", Abort);
+#endif
QTRY_COMPARE(view.npaints, 2);
// QRect(0, 0, 200, 12) is the first update, expanded (-2, -2, 2, 2)
// QRect(0, 12, 102, 10) is the scroll update, expanded (-2, -2, 2, 2),