summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2009-08-14 19:30:28 (GMT)
committerLars Knoll <lars.knoll@nokia.com>2009-08-14 19:32:15 (GMT)
commit02e5239002786a55d68f04a512baa7d4c5f40e66 (patch)
tree63c4a54b3120b17acdc49d3dbe300ee30e73bcac /doc/src
parent36a87c0a6cbc858dc5ae443cb16ded0f92c7725a (diff)
downloadQt-02e5239002786a55d68f04a512baa7d4c5f40e66.zip
Qt-02e5239002786a55d68f04a512baa7d4c5f40e66.tar.gz
Qt-02e5239002786a55d68f04a512baa7d4c5f40e66.tar.bz2
readd and fix the qml documentation for Rotation and Scale
This got forgotten during the move to QGraphicsTransform. The docs also required a few adjustments as Rotation3D is now gone and some properties in Scale and Rotation have changed.
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/declarative/effects.qdoc2
-rw-r--r--doc/src/declarative/elements.qdoc2
-rw-r--r--doc/src/snippets/declarative/rotation.qml8
3 files changed, 5 insertions, 7 deletions
diff --git a/doc/src/declarative/effects.qdoc b/doc/src/declarative/effects.qdoc
index 8350dc4..7879260 100644
--- a/doc/src/declarative/effects.qdoc
+++ b/doc/src/declarative/effects.qdoc
@@ -8,7 +8,7 @@
\list
\o Scaling (\l Item \bold scale property)
\o Opacity (\l Item \bold opacity property)
-\o Rotation (\l Item \bold rotation property, and Rotation3D)
+\o Rotation (\l Item \bold rotation property)
\o Affine Transforms (\l Squish)
\endlist
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc
index b5dd2bb..3f74ff5 100644
--- a/doc/src/declarative/elements.qdoc
+++ b/doc/src/declarative/elements.qdoc
@@ -137,8 +137,6 @@ The following table lists the Qml elements provided by the Qt Declarative module
\list
\o \l Scale
\o \l Rotation
-\o \l Squish
-\o \l Rotation3D
\endlist
\o
diff --git a/doc/src/snippets/declarative/rotation.qml b/doc/src/snippets/declarative/rotation.qml
index c7e184f..ab7d4ca 100644
--- a/doc/src/snippets/declarative/rotation.qml
+++ b/doc/src/snippets/declarative/rotation.qml
@@ -10,19 +10,19 @@ Rect {
Image { source: "pics/qt.png" }
Image {
source: "pics/qt.png"
- transform: Rotation3D { axis.startX: 30; axis.endX: 30; axis.endY: 60; angle: 18 }
+ transform: Rotation { origin.x: 30; axis.y: 60; axis.z: 0 angle: 18 }
}
Image {
source: "pics/qt.png"
- transform: Rotation3D { axis.startX: 30; axis.endX: 30; axis.endY: 60; angle: 36 }
+ transform: Rotation { origin.x: 30; axis.y: 60; axis.z: 0 angle: 36 }
}
Image {
source: "pics/qt.png"
- transform: Rotation3D { axis.startX: 30; axis.endX: 30; axis.endY: 60; angle: 54 }
+ transform: Rotation { origin.x: 30; axis.y: 60; axis.z: 0; angle: 54 }
}
Image {
source: "pics/qt.png"
- transform: Rotation3D { axis.startX: 30; axis.endX: 30; axis.endY: 60; angle: 72 }
+ transform: Rotation { origin.x: 30; axis.y: 60; axis.z: 0; angle: 72 }
}
}
//! [0]