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 /examples/declarative/listview | |
| 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 'examples/declarative/listview')
| -rw-r--r-- | examples/declarative/listview/highlight.qml | 2 | ||||
| -rw-r--r-- | examples/declarative/listview/recipes.qml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/examples/declarative/listview/highlight.qml b/examples/declarative/listview/highlight.qml index b9d56b2..11230e1 100644 --- a/examples/declarative/listview/highlight.qml +++ b/examples/declarative/listview/highlight.qml @@ -28,7 +28,7 @@ Rect { ] transitions: [ Transition { - NumericAnimation { + NumberAnimation { properties: "x"; duration: 200 } } diff --git a/examples/declarative/listview/recipes.qml b/examples/declarative/listview/recipes.qml index 829f074..6536b06 100644 --- a/examples/declarative/listview/recipes.qml +++ b/examples/declarative/listview/recipes.qml @@ -111,8 +111,8 @@ Rect { Transition { // Make the state changes smooth ParallelAnimation { - ColorAnimation { duration: 500 } - NumericAnimation { + ColorAnimation { property: "color"; duration: 500 } + NumberAnimation { duration: 300; properties: "detailsOpacity,x,yPosition,height,width" } } |