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 /tests/auto/declarative/visual | |
| 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 'tests/auto/declarative/visual')
4 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/declarative/visual/bindinganimation/bindinganimation.qml b/tests/auto/declarative/visual/bindinganimation/bindinganimation.qml index 9cb2509..69c5d81 100644 --- a/tests/auto/declarative/visual/bindinganimation/bindinganimation.qml +++ b/tests/auto/declarative/visual/bindinganimation/bindinganimation.qml @@ -25,7 +25,7 @@ Rect { ] transitions: [ Transition { - NumericAnimation { + NumberAnimation { properties: "x" } } diff --git a/tests/auto/declarative/visual/easing/easing.qml b/tests/auto/declarative/visual/easing/easing.qml index 14622c9..7a58276 100644 --- a/tests/auto/declarative/visual/easing/easing.qml +++ b/tests/auto/declarative/visual/easing/easing.qml @@ -167,7 +167,7 @@ Rect { fromState: "*" toState: "to" reversible: true - NumericAnimation { + NumberAnimation { properties: "x" easing: type } diff --git a/tests/auto/declarative/visual/flipable/flipable.xml b/tests/auto/declarative/visual/flipable/flipable.xml index d769e55..9288acc 100644 --- a/tests/auto/declarative/visual/flipable/flipable.xml +++ b/tests/auto/declarative/visual/flipable/flipable.xml @@ -104,17 +104,17 @@ </states> <transitions> <Transition fromState="*" toState="*"> - <NumericAnimation property="r" duration="500" /> + <NumberAnimation property="r" duration="500" /> <SerialAnimation> <SetPropertyAction target="{MeRect}" property="moveToParent" value="{Bounce}" /> <ParallelAnimation> - <NumericAnimation target="{MeRect}" properties="x" to="0" duration="250" /> - <NumericAnimation target="{MeRect}" properties="y" to="0" easing="easeInQuad" duration="250"/> + <NumberAnimation target="{MeRect}" properties="x" to="0" duration="250" /> + <NumberAnimation target="{MeRect}" properties="y" to="0" easing="easeInQuad" duration="250"/> </ParallelAnimation> <SetPropertyAction target="{MeRect}" property="moveToParent" /> <ParallelAnimation> - <NumericAnimation target="{MeRect}" properties="x" to="0" duration="250"/> - <NumericAnimation target="{MeRect}" properties="y" to="0" easing="easeOutQuad" duration="250"/> + <NumberAnimation target="{MeRect}" properties="x" to="0" duration="250"/> + <NumberAnimation target="{MeRect}" properties="y" to="0" easing="easeOutQuad" duration="250"/> </ParallelAnimation> </SerialAnimation> </Transition> diff --git a/tests/auto/declarative/visual/pauseAnimation/pauseAnimation.qml b/tests/auto/declarative/visual/pauseAnimation/pauseAnimation.qml index 5c00f58..e0880f0 100644 --- a/tests/auto/declarative/visual/pauseAnimation/pauseAnimation.qml +++ b/tests/auto/declarative/visual/pauseAnimation/pauseAnimation.qml @@ -11,11 +11,11 @@ Rect { y: SequentialAnimation { running: true repeat: true - NumericAnimation { + NumberAnimation { to: 0; duration: 500 easing: "easeInOutQuad" } - NumericAnimation { + NumberAnimation { to: 200-img.height easing: "easeOutBounce" duration: 2000 |