diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-05-05 05:15:01 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-05-05 05:15:01 (GMT) |
| commit | ac4b7b8ae7c7a18d9af4f21367148b9fdec4816e (patch) | |
| tree | a61aa98e3d718ca173103ca1831cc6e934cc8cb1 /tests/auto | |
| parent | b1bf4b23fb34337ea1b5ebdd5aedaad48f5c9f4a (diff) | |
| parent | cf6ed7eb5d4024f000d609a4627e8524b7bc676e (diff) | |
| download | Qt-ac4b7b8ae7c7a18d9af4f21367148b9fdec4816e.zip Qt-ac4b7b8ae7c7a18d9af4f21367148b9fdec4816e.tar.gz Qt-ac4b7b8ae7c7a18d9af4f21367148b9fdec4816e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/declarative/qmlvisual/animation/pauseAnimation/pauseAnimation-visual.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/declarative/qmlvisual/animation/pauseAnimation/pauseAnimation-visual.qml b/tests/auto/declarative/qmlvisual/animation/pauseAnimation/pauseAnimation-visual.qml index d82c6df..cc9a639 100644 --- a/tests/auto/declarative/qmlvisual/animation/pauseAnimation/pauseAnimation-visual.qml +++ b/tests/auto/declarative/qmlvisual/animation/pauseAnimation/pauseAnimation-visual.qml @@ -16,7 +16,7 @@ Rectangle { id: img source: "pics/qtlogo.png" x: 60-width/2 - y: 100 + y: 200-img.height SequentialAnimation on y { loops: Animation.Infinite NumberAnimation { @@ -24,7 +24,7 @@ Rectangle { easing.type: "InOutQuad" } NumberAnimation { - to: 100 + to: 200-img.height easing.type: "OutBounce" duration: 2000 } |