diff options
| author | Roberto Raggi <roberto.raggi@nokia.com> | 2010-02-23 08:44:01 (GMT) |
|---|---|---|
| committer | Roberto Raggi <roberto.raggi@nokia.com> | 2010-02-23 08:44:01 (GMT) |
| commit | ab3a625e1bc03481f740a32cdbe8c4559cf7cb1e (patch) | |
| tree | 01adb2ad207b9a2980492a24cb820925f7e48635 /examples/declarative/parallax/qml | |
| parent | 20fc9f2e264f34dd8580949ddbe5511b78ab0ac4 (diff) | |
| parent | 48161233af2a6071bc0ba99e546da98f705b8281 (diff) | |
| download | Qt-ab3a625e1bc03481f740a32cdbe8c4559cf7cb1e.zip Qt-ab3a625e1bc03481f740a32cdbe8c4559cf7cb1e.tar.gz Qt-ab3a625e1bc03481f740a32cdbe8c4559cf7cb1e.tar.bz2 | |
Merge remote branch 'origin/master' into qtruntime
Diffstat (limited to 'examples/declarative/parallax/qml')
| -rw-r--r-- | examples/declarative/parallax/qml/Smiley.qml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/examples/declarative/parallax/qml/Smiley.qml b/examples/declarative/parallax/qml/Smiley.qml index fc5b4fe..81eadda 100644 --- a/examples/declarative/parallax/qml/Smiley.qml +++ b/examples/declarative/parallax/qml/Smiley.qml @@ -27,16 +27,16 @@ Item { y: SequentialAnimation { repeat: true - // Move from minHeight to maxHeight in 300ms, using the easeOutExpo easing function + // Move from minHeight to maxHeight in 300ms, using the OutExpo easing function NumberAnimation { from: smiley.minHeight; to: smiley.maxHeight - easing: "easeOutExpo"; duration: 300 + easing.type: "OutExpo"; duration: 300 } - // Then move back to minHeight in 1 second, using the easeOutBounce easing function + // Then move back to minHeight in 1 second, using the OutBounce easing function NumberAnimation { from: smiley.maxHeight; to: smiley.minHeight - easing: "easeOutBounce"; duration: 1000 + easing.type: "OutBounce"; duration: 1000 } // Then pause for 500ms |