summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2009-11-20 03:37:57 (GMT)
committerAlan Alpert <alan.alpert@nokia.com>2009-11-20 03:37:57 (GMT)
commitddc7b6051468e57b470e9aa0b2e7f111f46a0e1a (patch)
tree0ff0b6055d190642f101b72861a0a2671500b2ff /tests/auto/declarative
parent1158bf03676258ea09bda3439a9c21abe669d090 (diff)
parent32593f94075c6325330799ebcc7ea47b22de9efa (diff)
downloadQt-ddc7b6051468e57b470e9aa0b2e7f111f46a0e1a.zip
Qt-ddc7b6051468e57b470e9aa0b2e7f111f46a0e1a.tar.gz
Qt-ddc7b6051468e57b470e9aa0b2e7f111f46a0e1a.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'tests/auto/declarative')
-rw-r--r--tests/auto/declarative/qmlgraphicspathview/data/pathview3.qml3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/declarative/qmlgraphicspathview/data/pathview3.qml b/tests/auto/declarative/qmlgraphicspathview/data/pathview3.qml
index a8c1e91..412cca2 100644
--- a/tests/auto/declarative/qmlgraphicspathview/data/pathview3.qml
+++ b/tests/auto/declarative/qmlgraphicspathview/data/pathview3.qml
@@ -47,11 +47,10 @@ PathView {
Rectangle {
id: wrapper
width: 85; height: 85; color: lColor
- scale: wrapper.PathView.scale
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
}
}
}