diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2009-10-05 05:26:01 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2009-10-05 05:26:01 (GMT) |
| commit | ef9f35f4b3f29a0013f04d6245c7eefd92d5a560 (patch) | |
| tree | 3d6963e61b0e9990aa1701272955a14c7cf7c5b1 | |
| parent | 7520e4fde92efc5621e42c8fe032e41f729f269f (diff) | |
| parent | 1993bc83725362c7f4e095e52f7e1b8a31c35686 (diff) | |
| download | Qt-ef9f35f4b3f29a0013f04d6245c7eefd92d5a560.zip Qt-ef9f35f4b3f29a0013f04d6245c7eefd92d5a560.tar.gz Qt-ef9f35f4b3f29a0013f04d6245c7eefd92d5a560.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| -rw-r--r-- | demos/declarative/flickr/flickr-desktop.qml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/demos/declarative/flickr/flickr-desktop.qml b/demos/declarative/flickr/flickr-desktop.qml index 6a4efd9..f8cf048 100644 --- a/demos/declarative/flickr/flickr-desktop.qml +++ b/demos/declarative/flickr/flickr-desktop.qml @@ -70,8 +70,8 @@ Item { PropertyChanges { target: ItemRotation; angle: 0 } PropertyChanges { target: Shadows; opacity: 0 } PropertyChanges { target: ImageDetails; y: 20 } - PropertyChanges { target: PhotoGridView; y: "-480" } - PropertyChanges { target: PhotoPathView; y: "-480" } + PropertyChanges { target: PhotoGridView; y: -480 } + PropertyChanges { target: PhotoPathView; y: -480 } PropertyChanges { target: ViewModeButton; opacity: 0 } PropertyChanges { target: TagsEdit; opacity: 0 } PropertyChanges { target: FetchButton; opacity: 0 } @@ -82,8 +82,10 @@ Item { transitions: [ Transition { from: "*"; to: "Details" - ParentAction { } - NumberAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" } + SequentialAnimation { + ParentAction { } + NumberAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" } + } }, Transition { from: "Details"; to: "*" |