summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2010-01-06 05:08:00 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2010-01-06 05:08:00 (GMT)
commit3320d031896fe36404552d03c639f535c78a8a6e (patch)
tree9572a9896bb365af366754eebc1128d1bf5d6aba
parent03a6b8a393aa94203b872a806d04f331d6162603 (diff)
downloadQt-3320d031896fe36404552d03c639f535c78a8a6e.zip
Qt-3320d031896fe36404552d03c639f535c78a8a6e.tar.gz
Qt-3320d031896fe36404552d03c639f535c78a8a6e.tar.bz2
Avoid spurious error messages
Delegate is reused in Grid and PathView, so PathView attributes might not be defined
-rw-r--r--demos/declarative/flickr/flickr-desktop.qml6
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 {