diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2010-05-05 07:44:27 (GMT) |
---|---|---|
committer | Alan Alpert <alan.alpert@nokia.com> | 2010-05-05 07:44:27 (GMT) |
commit | 1383f287137c50c7e58e7f9395f7a9ffd9441852 (patch) | |
tree | 25f8a9960cb58132bbf42af688cc44b1569809b1 /demos/declarative/photoviewer | |
parent | 238ed995be8f32e815ffb6883144d0547355a8eb (diff) | |
parent | 89b4f1eb2bae2f09a9db8094db91a7dabdcdb0a3 (diff) | |
download | Qt-1383f287137c50c7e58e7f9395f7a9ffd9441852.zip Qt-1383f287137c50c7e58e7f9395f7a9ffd9441852.tar.gz Qt-1383f287137c50c7e58e7f9395f7a9ffd9441852.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'demos/declarative/photoviewer')
-rw-r--r-- | demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml b/demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml index d39b7bc..142735f 100644 --- a/demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml +++ b/demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml @@ -78,11 +78,11 @@ Component { ] GridView.onAdd: NumberAnimation { - target: albumWrapper; properties: "scale"; from: 0.0; to: 1.0; easing.type: "OutQuad" + target: albumWrapper; properties: "scale"; from: 0.0; to: 1.0; easing.type: Easing.OutQuad } GridView.onRemove: SequentialAnimation { PropertyAction { target: albumWrapper; property: "GridView.delayRemove"; value: true } - NumberAnimation { target: albumWrapper; property: "scale"; from: 1.0; to: 0.0; easing.type: "OutQuad" } + NumberAnimation { target: albumWrapper; property: "scale"; from: 1.0; to: 0.0; easing.type: Easing.OutQuad } PropertyAction { target: albumWrapper; property: "GridView.delayRemove"; value: false } } @@ -92,12 +92,12 @@ Component { SequentialAnimation { NumberAnimation { properties: 'opacity'; duration: 250 } PauseAnimation { duration: 350 } - NumberAnimation { target: backButton; properties: "y"; duration: 200; easing.type: "OutQuad" } + NumberAnimation { target: backButton; properties: "y"; duration: 200; easing.type: Easing.OutQuad } } }, Transition { from: 'inGrid'; to: '*' - NumberAnimation { properties: "y,opacity"; easing.type: "OutQuad"; duration: 300 } + NumberAnimation { properties: "y,opacity"; easing.type: Easing.OutQuad; duration: 300 } } ] } |