diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-09-02 07:00:14 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-09-02 07:00:14 (GMT) |
| commit | 5455a16f49e8d36e604705c14c842c8a4e1b4f1f (patch) | |
| tree | 60e0fbdb2d2ab5109fb3327968b84681d433b73a /demos/declarative/flickr/flickr-desktop.qml | |
| parent | 2fc0161b46597bf64a8f88f027f3b98a021a8242 (diff) | |
| download | Qt-5455a16f49e8d36e604705c14c842c8a4e1b4f1f.zip Qt-5455a16f49e8d36e604705c14c842c8a4e1b4f1f.tar.gz Qt-5455a16f49e8d36e604705c14c842c8a4e1b4f1f.tar.bz2 | |
Disallow using typenames as ids
This is now illegal:
import Qt 4.6
Item { id: Item }
as is
import Qt 4.6
Item { id: Text }
Diffstat (limited to 'demos/declarative/flickr/flickr-desktop.qml')
| -rw-r--r-- | demos/declarative/flickr/flickr-desktop.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/demos/declarative/flickr/flickr-desktop.qml b/demos/declarative/flickr/flickr-desktop.qml index fca7e31..6a4efd9 100644 --- a/demos/declarative/flickr/flickr-desktop.qml +++ b/demos/declarative/flickr/flickr-desktop.qml @@ -15,7 +15,7 @@ Item { scale: Wrapper.PathView.scale; z: Wrapper.PathView.z transform: Rotation { - id: Rotation; origin.x: Wrapper.width/2; origin.y: Wrapper.height/2 + id: ItemRotation; origin.x: Wrapper.width/2; origin.y: Wrapper.height/2 axis.y: 1; axis.z: 0; angle: Wrapper.PathView.angle } @@ -67,7 +67,7 @@ Item { PropertyChanges { target: ImageDetails; z: 2 } ParentChange { target: Wrapper; parent: ImageDetails.frontContainer } PropertyChanges { target: Wrapper; x: 45; y: 35; scale: 1; z: 1000 } - PropertyChanges { target: Rotation; angle: 0 } + PropertyChanges { target: ItemRotation; angle: 0 } PropertyChanges { target: Shadows; opacity: 0 } PropertyChanges { target: ImageDetails; y: 20 } PropertyChanges { target: PhotoGridView; y: "-480" } |