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

Conflicts:
	.qmake.conf

Change-Id: I356ec83cf687bd2833f9a7c5e820d56b1efa8979

2 files changed, 88 insertions, 0 deletions

diff --git a/tests/auto/quick/qquickanimators/data/positionerWithAnimator.qml b/tests/auto/quick/qquickanimators/data/positionerWithAnimator.qml
new file mode 100644
index 0000000000..bfd475266e
--- /dev/null
+++ b/tests/auto/quick/qquickanimators/data/positionerWithAnimator.qml
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.2
+
+Column {
+    width: 200
+    height: 200
+
+    property alias repeater: repeater
+    property alias transition: transition
+
+    anchors.centerIn: parent
+    populate: Transition {
+        id: transition
+        ScaleAnimator {
+            from: 0
+            to: 1
+        }
+    }
+
+    Repeater {
+        id: repeater
+        model: ["red", "green", "blue"]
+
+        Rectangle {
+            width: 100
+            height: 100
+            color: modelData
+            scale: 0
+        }
+    }
+}
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)