Fix Animators in itemview and positioner transitions

In itemview/positioner transitions, Animator's target-property is never
explicitly set. QQuickItemViewTransition passes the animation target as
a "default target" instead. This change adds missing handling for the
default target.

QQuickItemViewTransition sets up default "x" and "y" state actions.
If Animator drives opacity, scale, or basically anything else than x/y
animations, it failed to extract the from/to values from the state
action list.

This change fixes the issue that if the default state actions do not
match the animator property (x/y vs. scale/opacity), it uses from/to
values specified on the animator itself. Before, it did that only if
the default state action list was empty. This is not the case with
itemview/positioner transitions.

Change-Id: I0f15e20bc860ddec23e59efebbc9cd346317f4de
Task-number: QTBUG-50908
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>

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 4108c1a124..7cacf3ba90 100644
--- a/tests/auto/quick/qquickanimators/tst_qquickanimators.cpp
+++ b/tests/auto/quick/qquickanimators/tst_qquickanimators.cpp
@@ -35,6 +35,8 @@
 
 #include <QtQuick>
 #include <private/qquickanimator_p.h>
+#include <private/qquickrepeater_p.h>
+#include <private/qquicktransition_p.h>
 
 #include <QtQml>
 
@@ -45,6 +47,7 @@ class tst_Animators: public QObject
 private slots:
     void testMultiWinAnimator_data();
     void testMultiWinAnimator();
+    void testTransitions();
 };
 
 void tst_Animators::testMultiWinAnimator_data()
@@ -99,6 +102,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)