aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qquickanimators/data
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2016-02-06 10:28:53 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2016-02-11 12:48:19 +0000
commit084dbb06d7b00c4a67edb6ce58956150036c35f2 (patch)
tree2a43e4a1db019fee4e869b69669bb463500aff1f /tests/auto/quick/qquickanimators/data
parent983a85e2222c0ed8e3e9bc0a8d03c28889952331 (diff)
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>
Diffstat (limited to 'tests/auto/quick/qquickanimators/data')
-rw-r--r--tests/auto/quick/qquickanimators/data/positionerWithAnimator.qml63
1 files changed, 63 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
+ }
+ }
+}