diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-01-07 09:57:01 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-01-07 09:57:01 (GMT) |
| commit | 570338ab3cbca8df3ca8f89579a8f460915e5a1e (patch) | |
| tree | 8421aa1d9e8eef2b1d05727750d52e3ed1d0f0d8 /demos/declarative | |
| parent | 2f3af7ba11de16fe23906d1bef5ccb6c37e8ccc7 (diff) | |
| parent | 78221020e2fd9370b0915a32cde81a95bdf44d87 (diff) | |
| download | Qt-570338ab3cbca8df3ca8f89579a8f460915e5a1e.zip Qt-570338ab3cbca8df3ca8f89579a8f460915e5a1e.tar.gz Qt-570338ab3cbca8df3ca8f89579a8f460915e5a1e.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'demos/declarative')
| -rw-r--r-- | demos/declarative/flickr/flickr-desktop.qml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/demos/declarative/flickr/flickr-desktop.qml b/demos/declarative/flickr/flickr-desktop.qml index 9c85237..10babeb 100644 --- a/demos/declarative/flickr/flickr-desktop.qml +++ b/demos/declarative/flickr/flickr-desktop.qml @@ -12,11 +12,13 @@ Item { id: photoDelegate Item { id: wrapper; width: 85; height: 85 - scale: wrapper.PathView.scale; z: wrapper.PathView.z + scale: wrapper.PathView.scale ? wrapper.PathView.scale : 1 + z: wrapper.PathView.z ? wrapper.PathView.z : 0 transform: Rotation { id: itemRotation; origin.x: wrapper.width/2; origin.y: wrapper.height/2 - axis.y: 1; axis.z: 0; angle: wrapper.PathView.angle + axis.y: 1; axis.z: 0 + angle: wrapper.PathView.angle ? wrapper.PathView.angle : 0 } Connection { |