QGraphicsRotation3D has been merged into QGraphicsRotation.

7 files changed, 9 insertions, 10 deletions

diff --git a/demos/declarative/flickr/content/ImageDetails.qml b/demos/declarative/flickr/content/ImageDetails.qml
index a18c230..8572fb3 100644
--- a/demos/declarative/flickr/content/ImageDetails.qml
+++ b/demos/declarative/flickr/content/ImageDetails.qml
@@ -21,7 +21,7 @@ Flipable {
     transform: Rotation3D {
         id: Rotation
         origin.x: Container.width / 2;
-        axis.y: 1;
+        axis.y: 1; axis.z: 0
     }
 
     front: Item {
diff --git a/demos/declarative/flickr/flickr.qml b/demos/declarative/flickr/flickr.qml
index c0a1a87..8e1e3e8 100644
--- a/demos/declarative/flickr/flickr.qml
+++ b/demos/declarative/flickr/flickr.qml
@@ -33,9 +33,9 @@ Item {
             id: Wrapper; width: 85; height: 85
             scale: Wrapper.PathView.scale; z: Wrapper.PathView.z
 
-            transform: Rotation3D {
+            transform: Rotation {
                 id: Rotation; origin.x: Wrapper.width/2; origin.y: Wrapper.height/2
-                axis.y: 1; angle: Wrapper.PathView.angle
+                axis.y: 1; axis.z: 0; angle: Wrapper.PathView.angle
             }
 
             Connection {
diff --git a/demos/declarative/flickr/flickr2.qml b/demos/declarative/flickr/flickr2.qml
index c972edf..f3b4244 100644
--- a/demos/declarative/flickr/flickr2.qml
+++ b/demos/declarative/flickr/flickr2.qml
@@ -36,8 +36,8 @@ Item {
                     property real angle: 0 * 0
 
                     transform: [
-                        Rotation3D {
-                            id: Rotation; origin.x: 30; axis.x: 30; axis.y: 60
+                        Rotation {
+                            id: Rotation; origin.x: 30; axis.x: 30; axis.y: 60; axis.z: 0
                             angle: Wrapper.angle
                         }
                     ]
diff --git a/examples/declarative/minehunt/minehunt.qml b/examples/declarative/minehunt/minehunt.qml
index 6b45b79..c57dbf2 100644
--- a/examples/declarative/minehunt/minehunt.qml
+++ b/examples/declarative/minehunt/minehunt.qml
@@ -16,10 +16,11 @@ Item {
                 width: 40
                 height: 40
                 property int angle: 0;
-                transform: Rotation3D {
+                transform: Rotation {
                     origin.x: 20
                     origin.y: 20
                     axis.x: 1
+                    axis.z: 0
                     angle: flipable.angle;
                 }
                 front: Image {
diff --git a/examples/declarative/snow/snow.qml b/examples/declarative/snow/snow.qml
index 5dd0006..f63f090 100644
--- a/examples/declarative/snow/snow.qml
+++ b/examples/declarative/snow/snow.qml
@@ -41,8 +41,8 @@ Rect {
             y: Follow { source: -(selectedY + imageHeight / 2); velocity: 500 }
         }
 
-        transform: Rotation3D { 
-            axis.y: 1
+        transform: Rotation {
+            axis.y: 1; axis.z: 0
             angle: MyLayout.deform * 100
         }
     }
diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp
index c68d0da..aba6bf1 100644
--- a/src/declarative/fx/qfxitem.cpp
+++ b/src/declarative/fx/qfxitem.cpp
@@ -75,7 +75,6 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Item,QFxItem)
 QML_DEFINE_NOCREATE_TYPE(QGraphicsTransform);
 QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Scale,QGraphicsScale)
 QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Rotation,QGraphicsRotation)
-QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Rotation3D,QGraphicsRotation3D)
 
 /*!
     \group group_animation
diff --git a/src/declarative/fx/qfxitem.h b/src/declarative/fx/qfxitem.h
index 6c317f7..f005d89 100644
--- a/src/declarative/fx/qfxitem.h
+++ b/src/declarative/fx/qfxitem.h
@@ -262,7 +262,6 @@ QML_DECLARE_TYPE(QFxItem)
 QML_DECLARE_TYPE(QGraphicsTransform)
 QML_DECLARE_TYPE(QGraphicsScale)
 QML_DECLARE_TYPE(QGraphicsRotation)
-QML_DECLARE_TYPE(QGraphicsRotation3D)
 
 QT_END_HEADER