Merge remote-tracking branch 'origin/5.6' into dev

Conflicts:
	.qmake.conf

Change-Id: I356ec83cf687bd2833f9a7c5e820d56b1efa8979

1 files changed, 25 insertions, 0 deletions

diff --git a/tests/auto/quick/qquickanimators/tst_qquickanimators.cpp b/tests/auto/quick/qquickanimators/tst_qquickanimators.cpp
index 6943bf5045..29142dee12 100644
--- a/tests/auto/quick/qquickanimators/tst_qquickanimators.cpp
+++ b/tests/auto/quick/qquickanimators/tst_qquickanimators.cpp
@@ -30,6 +30,8 @@
 
 #include <QtQuick>
 #include <private/qquickanimator_p.h>
+#include <private/qquickrepeater_p.h>
+#include <private/qquicktransition_p.h>
 
 #include <QtQml>
 
@@ -40,6 +42,7 @@ class tst_Animators: public QObject
 private slots:
     void testMultiWinAnimator_data();
     void testMultiWinAnimator();
+    void testTransitions();
 };
 
 void tst_Animators::testMultiWinAnimator_data()
@@ -94,6 +97,28 @@ void tst_Animators::testMultiWinAnimator()
     QVERIFY(true);
 }
 
+void tst_Animators::testTransitions()
+{
+    QQuickView view(QUrl::fromLocalFile("data/positionerWithAnimator.qml"));
+    view.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
+    QVERIFY(view.rootObject());
+
+    QQuickRepeater *repeater = view.rootObject()->property("repeater").value<QQuickRepeater *>();
+    QVERIFY(repeater);
+
+    QQuickItem *child = repeater->itemAt(0);
+    QVERIFY(child);
+    QCOMPARE(child->scale(), qreal(0.0));
+
+    QQuickTransition *transition = view.rootObject()->property("transition").value<QQuickTransition *>();
+    QVERIFY(transition);
+
+    QTRY_VERIFY(transition->running());
+    QTRY_VERIFY(!transition->running());
+    QCOMPARE(child->scale(), qreal(1.0));
+}
+
 #include "tst_qquickanimators.moc"
 
 QTEST_MAIN(tst_Animators)