diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-02-23 22:58:07 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-02-23 22:58:07 (GMT) |
| commit | ab86990893ef1b431c555c46a1e0df7cb9e37927 (patch) | |
| tree | e817cd0655e18c6f4f1f1980d2bad9325cb9e426 /doc/src/declarative | |
| parent | 520cca521ed320ab6751041d9a7bf9c18ee98fa1 (diff) | |
| parent | d19f691a5646725c69b232e2adde8c2f961eb571 (diff) | |
| download | Qt-ab86990893ef1b431c555c46a1e0df7cb9e37927.zip Qt-ab86990893ef1b431c555c46a1e0df7cb9e37927.tar.gz Qt-ab86990893ef1b431c555c46a1e0df7cb9e37927.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Diffstat (limited to 'doc/src/declarative')
| -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 d80c3fa..892535e 100644 --- a/doc/src/declarative/animation.qdoc +++ b/doc/src/declarative/animation.qdoc @@ -72,9 +72,9 @@ Rectangle { y: 0 y: SequentialAnimation { repeat: true - NumberAnimation { to: 200-img.height; easing: "easeOutBounce"; duration: 2000 } + NumberAnimation { to: 200-img.height; easing.type: "OutBounce"; duration: 2000 } PauseAnimation { duration: 1000 } - NumberAnimation { to: 0; easing: "easeOutQuad"; duration: 1000 } + NumberAnimation { to: 0; easing.type: "OutQuad"; duration: 1000 } } } } @@ -135,7 +135,7 @@ transitions: [ Transition { NumberAnimation { properties: "x,y" - easing: "easeOutBounce" + easing.type: "OutBounce" duration: 200 } } @@ -156,7 +156,7 @@ Transition { SequentialAnimation { NumberAnimation { duration: 1000 - easing: "easeOutBounce" + easing.type: "OutBounce" // animate myItem's x and y if they have changed in the state target: myItem properties: "x,y" @@ -198,7 +198,7 @@ Transition { ParallelAnimation { NumberAnimation { duration: 1000 - easing: "easeOutBounce" + easing.type: "OutBounce" targets: box1 properties: "x,y" } @@ -226,7 +226,7 @@ Rectangle { id: redRect color: "red" width: 100; height: 100 - x: Behavior { NumberAnimation { duration: 300; easing: "InOutQuad" } } + x: Behavior { NumberAnimation { duration: 300; easing.type: "InOutQuad" } } } \endqml |