summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann Bodson <yann.bodson@nokia.com>2009-11-05 06:57:36 (GMT)
committerYann Bodson <yann.bodson@nokia.com>2009-11-05 06:57:36 (GMT)
commit418e59135e1287d2e335ec4a3379a03e63895e3a (patch)
tree15d80f2a7f2ca0b17e3fb6449a9fe15885ced5bb
parent01d7ae66da344f9aaef039310ac241015ec4cad5 (diff)
parentcec070f3905bcf6127e4e14236d5c61f09e3a61f (diff)
downloadQt-418e59135e1287d2e335ec4a3379a03e63895e3a.zip
Qt-418e59135e1287d2e335ec4a3379a03e63895e3a.tar.gz
Qt-418e59135e1287d2e335ec4a3379a03e63895e3a.tar.bz2
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
-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
*/