diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-03-25 08:34:13 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-03-25 08:34:13 (GMT) |
| commit | 20073b78ca34deea244a999bbc221a63995869d8 (patch) | |
| tree | 43f93f498ee7057ea3ab221a73b7f4d9762f56e9 /demos | |
| parent | a701a744a1e292803823c43aad4d81a9cff25a32 (diff) | |
| parent | 72599ca45c416f2f0a9654412c14a148ca3d728c (diff) | |
| download | Qt-20073b78ca34deea244a999bbc221a63995869d8.zip Qt-20073b78ca34deea244a999bbc221a63995869d8.tar.gz Qt-20073b78ca34deea244a999bbc221a63995869d8.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/declarative/flickr/common/Loading.qml | 4 | ||||
| -rw-r--r-- | demos/declarative/photoviewer/PhotoViewerCore/BusyIndicator.qml | 2 | ||||
| -rw-r--r-- | demos/declarative/twitter/TwitterCore/Loading.qml | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/demos/declarative/flickr/common/Loading.qml b/demos/declarative/flickr/common/Loading.qml index 938a080..4c41717 100644 --- a/demos/declarative/flickr/common/Loading.qml +++ b/demos/declarative/flickr/common/Loading.qml @@ -1,8 +1,8 @@ import Qt 4.6 Image { - id: loading; source: "pics/loading.png"; transformOrigin: "Center" + id: loading; source: "pics/loading.png" NumberAnimation on rotation { - from: 0; to: 360; running: loading.visible == true; repeat: true; duration: 900 + from: 0; to: 360; running: loading.visible == true; loops: Animation.Infinite; duration: 900 } } diff --git a/demos/declarative/photoviewer/PhotoViewerCore/BusyIndicator.qml b/demos/declarative/photoviewer/PhotoViewerCore/BusyIndicator.qml index 919ac43..361659c 100644 --- a/demos/declarative/photoviewer/PhotoViewerCore/BusyIndicator.qml +++ b/demos/declarative/photoviewer/PhotoViewerCore/BusyIndicator.qml @@ -5,5 +5,5 @@ Image { property bool on: false source: "images/busy.png"; visible: container.on - NumberAnimation on rotation { running: container.on; from: 0; to: 360; repeat: true; duration: 1200 } + NumberAnimation on rotation { running: container.on; from: 0; to: 360; loops: Animation.Infinite; duration: 1200 } } diff --git a/demos/declarative/twitter/TwitterCore/Loading.qml b/demos/declarative/twitter/TwitterCore/Loading.qml index 76bf64b..957de0f 100644 --- a/demos/declarative/twitter/TwitterCore/Loading.qml +++ b/demos/declarative/twitter/TwitterCore/Loading.qml @@ -1,8 +1,8 @@ import Qt 4.6 Image { - id: loading; source: "images/loading.png"; transformOrigin: "Center" + id: loading; source: "images/loading.png" NumberAnimation on rotation { - from: 0; to: 360; running: loading.visible == true; repeat: true; duration: 900 + from: 0; to: 360; running: loading.visible == true; loops: Animation.Infinite; duration: 900 } } |