diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2010-03-23 01:12:46 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2010-03-23 03:49:12 (GMT) |
| commit | 7711d400e4ad4d65363bc910d76acdf0d1065195 (patch) | |
| tree | 1fb64c9471a8a0f14bde5e3b442cafa7ece2baba /demos/declarative | |
| parent | da96ef1a17a27b09129f73c6e7f3134806545d92 (diff) | |
| download | Qt-7711d400e4ad4d65363bc910d76acdf0d1065195.zip Qt-7711d400e4ad4d65363bc910d76acdf0d1065195.tar.gz Qt-7711d400e4ad4d65363bc910d76acdf0d1065195.tar.bz2 | |
Remove ParentAction.
It has been replaced with ParentAnimation.
Diffstat (limited to 'demos/declarative')
| -rw-r--r-- | demos/declarative/flickr/flickr-desktop.qml | 10 | ||||
| -rw-r--r-- | demos/declarative/flickr/mobile/GridDelegate.qml | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/demos/declarative/flickr/flickr-desktop.qml b/demos/declarative/flickr/flickr-desktop.qml index 4de2202..63b6ea2 100644 --- a/demos/declarative/flickr/flickr-desktop.qml +++ b/demos/declarative/flickr/flickr-desktop.qml @@ -83,15 +83,17 @@ Item { Transition { from: "*"; to: "Details" SequentialAnimation { - ParentAction { } - NumberAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing.type: "InOutQuad" } + ParentAnimation { + NumberAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing.type: "InOutQuad" } + } } }, Transition { from: "Details"; to: "*" SequentialAnimation { - ParentAction { } - NumberAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing.type: "InOutQuad" } + ParentAnimation { + NumberAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing.type: "InOutQuad" } + } PropertyAction { targets: wrapper; properties: "z" } } } diff --git a/demos/declarative/flickr/mobile/GridDelegate.qml b/demos/declarative/flickr/mobile/GridDelegate.qml index 767315c..b54585b 100644 --- a/demos/declarative/flickr/mobile/GridDelegate.qml +++ b/demos/declarative/flickr/mobile/GridDelegate.qml @@ -52,14 +52,16 @@ transitions: [ Transition { from: "Show"; to: "Details" - ParentAction { } - NumberAnimation { properties: "x,y"; duration: 500; easing.type: "InOutQuad" } + ParentAnimation { + NumberAnimation { properties: "x,y"; duration: 500; easing.type: "InOutQuad" } + } }, Transition { from: "Details"; to: "Show" SequentialAnimation { - ParentAction { } - NumberAnimation { properties: "x,y"; duration: 500; easing.type: "InOutQuad" } + ParentAnimation { + NumberAnimation { properties: "x,y"; duration: 500; easing.type: "InOutQuad" } + } PropertyAction { targets: wrapper; properties: "z" } } } |