diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-06-26 04:58:10 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-06-26 04:58:10 (GMT) |
commit | 13086523d7181d5628872c74030b460e5f7388a5 (patch) | |
tree | f5b3317c138fb18d47d8b2e0060bc4a8512da1a1 /demos/declarative/flickr/flickr2.qml | |
parent | 3c45c081ce33f05ae200d252ebb5e9e1484bcc6d (diff) | |
parent | 40a59d973c324e45954481f608e1bfc2b9579300 (diff) | |
download | Qt-13086523d7181d5628872c74030b460e5f7388a5.zip Qt-13086523d7181d5628872c74030b460e5f7388a5.tar.gz Qt-13086523d7181d5628872c74030b460e5f7388a5.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
examples/declarative/states/states.qml
examples/declarative/states/transitions.qml
examples/declarative/tutorials/helloworld/t3/tutorial3.qml
src/declarative/util/qmlanimation.cpp
Diffstat (limited to 'demos/declarative/flickr/flickr2.qml')
-rw-r--r-- | demos/declarative/flickr/flickr2.qml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/demos/declarative/flickr/flickr2.qml b/demos/declarative/flickr/flickr2.qml index 2f4c823..947bf9e 100644 --- a/demos/declarative/flickr/flickr2.qml +++ b/demos/declarative/flickr/flickr2.qml @@ -99,13 +99,13 @@ Item { Transition { fromState: "*"; toState: "Details" ParentChangeAction { } - NumericAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" } + NumberAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" } }, Transition { fromState: "Details"; toState: "*" SequentialAnimation { ParentChangeAction { } - NumericAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" } + NumberAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" } SetPropertyAction { filter: Wrapper; properties: "z" } } } @@ -142,14 +142,14 @@ Item { SequentialAnimation { SetPropertyAction { target: Wrapper; property: "moveToParent" } ParallelAnimation { - NumericAnimation { + NumberAnimation { target: Wrapper properties: "x,y" to: 0 easing: "easeOutQuad" duration: 350 } - NumericAnimation { target: Wrapper; properties: "scale,angle"; duration: 350 } + NumberAnimation { target: Wrapper; properties: "scale,angle"; duration: 350 } } } }, @@ -159,14 +159,14 @@ Item { PauseAnimation { duration: Math.floor(index/7)*100 } SetPropertyAction { target: Wrapper; property: "moveToParent" } ParallelAnimation { - NumericAnimation { + NumberAnimation { target: Wrapper properties: "x,y" to: 0 easing: "easeOutQuad" duration: 250 } - NumericAnimation { target: Wrapper; properties: "scale,angle"; duration: 250 } + NumberAnimation { target: Wrapper; properties: "scale,angle"; duration: 250 } } } } |