diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-07-12 12:35:27 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-07-12 12:35:27 (GMT) |
| commit | 55ff179342bfb67b6f2592d7b1df66e1f3c6a350 (patch) | |
| tree | 266b6e82ae4de9c1eb2f0c2d2c2310f774a55089 /tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/smoothedfollow.qml | |
| parent | 0713442baa4120050e85c13998797415bb40efce (diff) | |
| parent | e4f5a81869e75a998278c19134f2772fefd998fe (diff) | |
| download | Qt-55ff179342bfb67b6f2592d7b1df66e1f3c6a350.zip Qt-55ff179342bfb67b6f2592d7b1df66e1f3c6a350.tar.gz Qt-55ff179342bfb67b6f2592d7b1df66e1f3c6a350.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/smoothedfollow.qml')
| -rw-r--r-- | tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/smoothedfollow.qml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/smoothedfollow.qml b/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/smoothedfollow.qml index 7ca0ca5..0df727b 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/smoothedfollow.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/smoothedfollow.qml @@ -14,27 +14,27 @@ Rectangle { } Rectangle { - width: 50; height: 20; y: 60; color: "red" - SmoothedFollow on x { to: rect.x; velocity: 400; enabled: true } + width: 50; height: 20; x: rect.x; y: 60; color: "red" + Behavior on x { SmoothedAnimation { velocity: 400 } } } Rectangle { - width: 50; height: 20; y: 90; color: "yellow" - SmoothedFollow on x { to: rect.x; velocity: 300; reversingMode: SmoothedAnimation.Immediate; enabled: true } + width: 50; height: 20; x: rect.x; y: 90; color: "yellow" + Behavior on x { SmoothedAnimation { velocity: 300; reversingMode: SmoothedAnimation.Immediate } } } Rectangle { - width: 50; height: 20; y: 120; color: "green" - SmoothedFollow on x { to: rect.x; reversingMode: SmoothedAnimation.Sync; enabled: true } + width: 50; height: 20; x: rect.x; y: 120; color: "green" + Behavior on x { SmoothedAnimation { reversingMode: SmoothedAnimation.Sync } } } Rectangle { - width: 50; height: 20; y: 150; color: "purple" - SmoothedFollow on x { to: rect.x; maximumEasingTime: 200; enabled: true } + width: 50; height: 20; x: rect.x; y: 150; color: "purple" + Behavior on x { SmoothedAnimation { maximumEasingTime: 200 } } } Rectangle { - width: 50; height: 20; y: 180; color: "blue" - SmoothedFollow on x { to: rect.x; duration: 300; enabled: true } + width: 50; height: 20; x: rect.x; y: 180; color: "blue" + Behavior on x { SmoothedAnimation { duration: 300 } } } } |