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

2 files changed, 24 insertions, 3 deletions

diff --git a/doc/src/declarative/advtutorial4.qdoc b/doc/src/declarative/advtutorial4.qdoc
index e30fe84..5f8c0e9 100644
--- a/doc/src/declarative/advtutorial4.qdoc
+++ b/doc/src/declarative/advtutorial4.qdoc
@@ -106,9 +106,9 @@ the block, like so:
 
 \snippet declarative/tutorials/samegame/samegame4/content/BoomBlock.qml 3
 
-To fully understand this you'll want to look at the Particles element documentation, but it's important to note that count is set
-to zero.
-We next extend the 'dying' state, which triggers the particles by setting the count to non-zero. The code for the states now look
+To fully understand this you'll want to look at the Particles element documentation, but it's important to note that emissionRate is set
+to zero, so that no particles are emitted normally.
+We next extend the 'dying' state, which creates a burst of particles by calling the burst method on the particles element. The code for the states now look
 like this:
 
 \snippet declarative/tutorials/samegame/samegame4/content/BoomBlock.qml 4
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
 */