diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-05-06 01:01:16 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-05-06 01:01:16 (GMT) |
| commit | 385799a8269dfb5b48de9e84e52af780fb400272 (patch) | |
| tree | babe8936cdd06f5b50be8b9bb671504be309b4c8 /doc/src | |
| parent | 4b0c60c6246fb7aacea3d74787a9e5a0cc507edd (diff) | |
| parent | 1eb430a1f1ddb3d88ec44294606b365e119b2e01 (diff) | |
| download | Qt-385799a8269dfb5b48de9e84e52af780fb400272.zip Qt-385799a8269dfb5b48de9e84e52af780fb400272.tar.gz Qt-385799a8269dfb5b48de9e84e52af780fb400272.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/declarative/animation.qdoc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/src/declarative/animation.qdoc b/doc/src/declarative/animation.qdoc index 88aca1b..6e98949 100644 --- a/doc/src/declarative/animation.qdoc +++ b/doc/src/declarative/animation.qdoc @@ -73,9 +73,9 @@ Rectangle { y: 0 SequentialAnimation on y { loops: Animation.Infinite - NumberAnimation { to: 200-img.height; easing.type: "OutBounce"; duration: 2000 } + NumberAnimation { to: 200-img.height; easing.type: Easing.OutBounce; duration: 2000 } PauseAnimation { duration: 1000 } - NumberAnimation { to: 0; easing.type: "OutQuad"; duration: 1000 } + NumberAnimation { to: 0; easing.type: Easing.OutQuad; duration: 1000 } } } } @@ -136,7 +136,7 @@ transitions: [ Transition { NumberAnimation { properties: "x,y" - easing.type: "OutBounce" + easing.type: Easing.OutBounce duration: 200 } } @@ -157,7 +157,7 @@ Transition { SequentialAnimation { NumberAnimation { duration: 1000 - easing.type: "OutBounce" + easing.type: Easing.OutBounce // animate myItem's x and y if they have changed in the state target: myItem properties: "x,y" @@ -199,7 +199,7 @@ Transition { ParallelAnimation { NumberAnimation { duration: 1000 - easing.type: "OutBounce" + easing.type: Easing.OutBounce targets: box1 properties: "x,y" } @@ -227,7 +227,7 @@ Rectangle { id: redRect color: "red" width: 100; height: 100 - Behavior on x { NumberAnimation { duration: 300; easing.type: "InOutQuad" } } + Behavior on x { NumberAnimation { duration: 300; easing.type: Easing.InOutQuad } } } \endqml |