Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui

Conflicts:
	src/gui/graphicsview/qgraphicsitem.cpp
	src/gui/graphicsview/qgraphicsitem.h
	src/gui/graphicsview/qgraphicsitem_p.h
	src/gui/graphicsview/qgraphicsscene.cpp

1 files changed, 30 insertions, 30 deletions

diff --git a/examples/animation/states/main.cpp b/examples/animation/states/main.cpp
index f326aae..a9eebbc 100644
--- a/examples/animation/states/main.cpp
+++ b/examples/animation/states/main.cpp
@@ -139,12 +139,12 @@ int main(int argc, char *argv[])
     state1->assignProperty(p4, "geometry", QRectF(68-150, 48-150, 64, 64));
     state1->assignProperty(p5, "geometry", QRectF(168, 48-150, 64, 64));
     state1->assignProperty(p6, "geometry", QRectF(268+150, 48-150, 64, 64));
-    state1->assignProperty(p1, "zRotation", qreal(0));
-    state1->assignProperty(p2, "zRotation", qreal(0));
-    state1->assignProperty(p3, "zRotation", qreal(0));
-    state1->assignProperty(p4, "zRotation", qreal(-270));
-    state1->assignProperty(p5, "zRotation", qreal(-90));
-    state1->assignProperty(p6, "zRotation", qreal(270));
+    state1->assignProperty(p1, "rotation", qreal(0));
+    state1->assignProperty(p2, "rotation", qreal(0));
+    state1->assignProperty(p3, "rotation", qreal(0));
+    state1->assignProperty(p4, "rotation", qreal(-270));
+    state1->assignProperty(p5, "rotation", qreal(-90));
+    state1->assignProperty(p6, "rotation", qreal(270));
     state1->assignProperty(boxProxy, "opacity", qreal(0));
     state1->assignProperty(p1, "opacity", qreal(1));
     state1->assignProperty(p2, "opacity", qreal(1));
@@ -163,12 +163,12 @@ int main(int argc, char *argv[])
     state2->assignProperty(p4, "geometry", QRectF(64, 48, 64, 64));
     state2->assignProperty(p5, "geometry", QRectF(168, 48, 64, 64));
     state2->assignProperty(p6, "geometry", QRectF(268, 48, 64, 64));
-    state2->assignProperty(p1, "zRotation", qreal(-270));
-    state2->assignProperty(p2, "zRotation", qreal(90));
-    state2->assignProperty(p3, "zRotation", qreal(270));
-    state2->assignProperty(p4, "zRotation", qreal(0));
-    state2->assignProperty(p5, "zRotation", qreal(0));
-    state2->assignProperty(p6, "zRotation", qreal(0));
+    state2->assignProperty(p1, "rotation", qreal(-270));
+    state2->assignProperty(p2, "rotation", qreal(90));
+    state2->assignProperty(p3, "rotation", qreal(270));
+    state2->assignProperty(p4, "rotation", qreal(0));
+    state2->assignProperty(p5, "rotation", qreal(0));
+    state2->assignProperty(p6, "rotation", qreal(0));
     state2->assignProperty(boxProxy, "opacity", qreal(1));
     state2->assignProperty(p1, "opacity", qreal(0));
     state2->assignProperty(p2, "opacity", qreal(0));
@@ -208,12 +208,12 @@ int main(int argc, char *argv[])
     animation1.addAnimation(new QPropertyAnimation(p4, "geometry"));
     animation1.addAnimation(new QPropertyAnimation(p5, "geometry"));
     animation1.addAnimation(new QPropertyAnimation(p6, "geometry"));
-    animation1.addAnimation(new QPropertyAnimation(p1, "zRotation"));
-    animation1.addAnimation(new QPropertyAnimation(p2, "zRotation"));
-    animation1.addAnimation(new QPropertyAnimation(p3, "zRotation"));
-    animation1.addAnimation(new QPropertyAnimation(p4, "zRotation"));
-    animation1.addAnimation(new QPropertyAnimation(p5, "zRotation"));
-    animation1.addAnimation(new QPropertyAnimation(p6, "zRotation"));
+    animation1.addAnimation(new QPropertyAnimation(p1, "rotation"));
+    animation1.addAnimation(new QPropertyAnimation(p2, "rotation"));
+    animation1.addAnimation(new QPropertyAnimation(p3, "rotation"));
+    animation1.addAnimation(new QPropertyAnimation(p4, "rotation"));
+    animation1.addAnimation(new QPropertyAnimation(p5, "rotation"));
+    animation1.addAnimation(new QPropertyAnimation(p6, "rotation"));
     animation1.addAnimation(new QPropertyAnimation(p1, "opacity"));
     animation1.addAnimation(new QPropertyAnimation(p2, "opacity"));
     animation1.addAnimation(new QPropertyAnimation(p3, "opacity"));
@@ -230,12 +230,12 @@ int main(int argc, char *argv[])
     animation2.addAnimation(new QPropertyAnimation(p4, "geometry"));
     animation2.addAnimation(new QPropertyAnimation(p5, "geometry"));
     animation2.addAnimation(new QPropertyAnimation(p6, "geometry"));
-    animation2.addAnimation(new QPropertyAnimation(p1, "zRotation"));
-    animation2.addAnimation(new QPropertyAnimation(p2, "zRotation"));
-    animation2.addAnimation(new QPropertyAnimation(p3, "zRotation"));
-    animation2.addAnimation(new QPropertyAnimation(p4, "zRotation"));
-    animation2.addAnimation(new QPropertyAnimation(p5, "zRotation"));
-    animation2.addAnimation(new QPropertyAnimation(p6, "zRotation"));
+    animation2.addAnimation(new QPropertyAnimation(p1, "rotation"));
+    animation2.addAnimation(new QPropertyAnimation(p2, "rotation"));
+    animation2.addAnimation(new QPropertyAnimation(p3, "rotation"));
+    animation2.addAnimation(new QPropertyAnimation(p4, "rotation"));
+    animation2.addAnimation(new QPropertyAnimation(p5, "rotation"));
+    animation2.addAnimation(new QPropertyAnimation(p6, "rotation"));
     animation2.addAnimation(new QPropertyAnimation(p1, "opacity"));
     animation2.addAnimation(new QPropertyAnimation(p2, "opacity"));
     animation2.addAnimation(new QPropertyAnimation(p3, "opacity"));
@@ -252,12 +252,12 @@ int main(int argc, char *argv[])
     animation3.addAnimation(new QPropertyAnimation(p4, "geometry"));
     animation3.addAnimation(new QPropertyAnimation(p5, "geometry"));
     animation3.addAnimation(new QPropertyAnimation(p6, "geometry"));
-    animation3.addAnimation(new QPropertyAnimation(p1, "zRotation"));
-    animation3.addAnimation(new QPropertyAnimation(p2, "zRotation"));
-    animation3.addAnimation(new QPropertyAnimation(p3, "zRotation"));
-    animation3.addAnimation(new QPropertyAnimation(p4, "zRotation"));
-    animation3.addAnimation(new QPropertyAnimation(p5, "zRotation"));
-    animation3.addAnimation(new QPropertyAnimation(p6, "zRotation"));
+    animation3.addAnimation(new QPropertyAnimation(p1, "rotation"));
+    animation3.addAnimation(new QPropertyAnimation(p2, "rotation"));
+    animation3.addAnimation(new QPropertyAnimation(p3, "rotation"));
+    animation3.addAnimation(new QPropertyAnimation(p4, "rotation"));
+    animation3.addAnimation(new QPropertyAnimation(p5, "rotation"));
+    animation3.addAnimation(new QPropertyAnimation(p6, "rotation"));
     animation3.addAnimation(new QPropertyAnimation(p1, "opacity"));
     animation3.addAnimation(new QPropertyAnimation(p2, "opacity"));
     animation3.addAnimation(new QPropertyAnimation(p3, "opacity"));