summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2009-11-05 07:09:18 (GMT)
committerAlan Alpert <alan.alpert@nokia.com>2009-11-05 07:09:18 (GMT)
commit31e07c3838b72a208ec2853e6194ebe1692128f3 (patch)
tree0c09bd00e72db73299003d9cd2c7cbd3194c00f6 /doc/src
parent085dd75830357b359abf53b7d37c049cdd17977c (diff)
parent26cae0653332caf0b4e315fd35fd59469c66bac9 (diff)
downloadQt-31e07c3838b72a208ec2853e6194ebe1692128f3.zip
Qt-31e07c3838b72a208ec2853e6194ebe1692128f3.tar.gz
Qt-31e07c3838b72a208ec2853e6194ebe1692128f3.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/declarative/basictypes.qdoc21
1 files changed, 21 insertions, 0 deletions
diff --git a/doc/src/declarative/basictypes.qdoc b/doc/src/declarative/basictypes.qdoc
index 80ec211..0551443 100644
--- a/doc/src/declarative/basictypes.qdoc
+++ b/doc/src/declarative/basictypes.qdoc
@@ -233,4 +233,25 @@
\endqml
\c Child1, \c Child2 and \c Child3 will all be added to the children list
in the order in which they appear.
+
+ \target basicqmlvector3d
+ \section1 vector3d
+
+ A \c vector3d is specified in \c "x,y,z" format:
+
+ \qml
+ Rotation { angle: 60; axis: "0,1,0" }
+ \endqml
+
+ or with the \c{Qt.vector3d()} helper function:
+
+ \qml
+ Rotation { angle: 60; axis: Qt.vector3d(0, 1, 0) }
+ \endqml
+
+ or as separate \c x, \c y, and \c z components:
+
+ \qml
+ Rotation { angle: 60; axis.x: 0; axis.y: 1; axis.z: 0 }
+ \endqml
*/