aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qtquick2/qquickpathview/tst_qquickpathview.cpp
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2012-01-06 14:02:10 +1000
committerQt by Nokia <qt-info@nokia.com>2012-01-13 07:54:20 +0100
commitc194b012182c3ae495bb7a740f02a5a9f5b3c3b3 (patch)
tree47738d95edbb6873473738eb561e3a5b4ce6b931 /tests/auto/qtquick2/qquickpathview/tst_qquickpathview.cpp
parentd9ecb7345c23cff097ea1a83a829673e220b400f (diff)
Add tests for item polish bug on Mac
On Mac OS X, if a QQuickItem triggers a polish request from Component.onCompleted, its updatePolish() function is not called. The tst_qquickitem::polishOnCompleted() test demonstrates this. If a running animation is added to the polishOnCompleted.qml in the test, the test will pass. Task-number: QTBUG-23481, QTBUG-23480, QTBUG-21590 Change-Id: I172b12e784aa458c43c23e0ee43f034f0bd332ee Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests/auto/qtquick2/qquickpathview/tst_qquickpathview.cpp')
-rw-r--r--tests/auto/qtquick2/qquickpathview/tst_qquickpathview.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/qtquick2/qquickpathview/tst_qquickpathview.cpp b/tests/auto/qtquick2/qquickpathview/tst_qquickpathview.cpp
index 68bff03207..8c6dd19e5b 100644
--- a/tests/auto/qtquick2/qquickpathview/tst_qquickpathview.cpp
+++ b/tests/auto/qtquick2/qquickpathview/tst_qquickpathview.cpp
@@ -1194,10 +1194,6 @@ void tst_QQuickPathView::pathUpdateOnStartChanged()
void tst_QQuickPathView::package()
{
-#ifdef Q_OS_MAC
- QSKIP("QTBUG-23482");
-#endif
-
QQuickView *canvas = createView();
QVERIFY(canvas);
canvas->setSource(testFileUrl("pathview_package.qml"));
@@ -1207,6 +1203,10 @@ void tst_QQuickPathView::package()
QQuickPathView *pathView = canvas->rootObject()->findChild<QQuickPathView*>("photoPathView");
QVERIFY(pathView);
+#ifdef Q_OS_MAC
+ QSKIP("QTBUG-21590 view does not reliably receive polish without a running animation");
+#endif
+
QQuickItem *item = findItem<QQuickItem>(pathView, "pathItem");
QVERIFY(item);
QVERIFY(item->scale() != 1.0);