diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-03-25 00:29:57 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-03-25 00:29:57 (GMT) |
commit | 45ba7232441c78b9fd6864f422d842f836aafdf3 (patch) | |
tree | df515a4f4467ffb73fe9e1ea8ddd115ccff48b89 /doc/src | |
parent | edf7d8c450b1dbc55e10d68083e19e04366062ef (diff) | |
parent | d232ff28fc97a6bac3ee9ac054109517e3a47cf4 (diff) | |
download | Qt-45ba7232441c78b9fd6864f422d842f836aafdf3.zip Qt-45ba7232441c78b9fd6864f422d842f836aafdf3.tar.gz Qt-45ba7232441c78b9fd6864f422d842f836aafdf3.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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/declarative/animation.qdoc b/doc/src/declarative/animation.qdoc index 7e0a787..00993f0 100644 --- a/doc/src/declarative/animation.qdoc +++ b/doc/src/declarative/animation.qdoc @@ -72,7 +72,7 @@ Rectangle { x: 60-img.width/2 y: 0 SequentialAnimation on y { - repeat: true + loops: Qt.Infinite NumberAnimation { to: 200-img.height; easing.type: "OutBounce"; duration: 2000 } PauseAnimation { duration: 1000 } NumberAnimation { to: 0; easing.type: "OutQuad"; duration: 1000 } |