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

14 files changed, 18 insertions, 9 deletions

diff --git a/doc/src/declarative/anchor-layout.qdoc b/doc/src/declarative/anchor-layout.qdoc
index 9647a72..2b1f081 100644
--- a/doc/src/declarative/anchor-layout.qdoc
+++ b/doc/src/declarative/anchor-layout.qdoc
@@ -3,7 +3,7 @@
 \target anchor-layout
 \title Anchor-based Layout
 
-In additional to the more traditional Fx layouts \l {xmlGridLayout}{GridLayout}, \l {xmlHorizontalLayout}{HorizontalLayout}, and \l {xmlVerticalLayout}{VerticalLayout}, QML also provides a way to layout items using the concept of anchors. Each visual Fx item can be thought of as having a set of 6 invisible "anchor lines": \e left, \e horizontalCenter, \e right, \e top, \e verticalCenter, and \e bottom.
+In additional to the more traditional Fx layouts GridLayout, HorizontalLayout, and VerticalLayout, QML also provides a way to layout items using the concept of anchors. Each visual Fx item can be thought of as having a set of 6 invisible "anchor lines": \e left, \e horizontalCenter, \e right, \e top, \e verticalCenter, and \e bottom.
 
 \image edges_qml.png
 
diff --git a/doc/src/declarative/animation.qdoc b/doc/src/declarative/animation.qdoc
index a1ab44b..a143d4c 100644
--- a/doc/src/declarative/animation.qdoc
+++ b/doc/src/declarative/animation.qdoc
@@ -126,5 +126,5 @@ Transitions can happen in parallel, in sequence, or in any combination of the tw
 
 \section1 Property Behaviors
 
-\todo Document.  Should we remove property behaviour altogether?
+\note Property behaviors are currently experimental.
 */
diff --git a/doc/src/declarative/basictypes.qdoc b/doc/src/declarative/basictypes.qdoc
index d6dae77..a6b9177 100644
--- a/doc/src/declarative/basictypes.qdoc
+++ b/doc/src/declarative/basictypes.qdoc
@@ -367,7 +367,7 @@
     types.  When used from QML, the engine  automatically appends each value to the
     list.  
     
-    For example, the \l {xmlItem}{Item} class has a children list property
+    For example, the \l Item class has a children list property
     that can be used like this:
     \code
     <Item>
diff --git a/doc/src/declarative/effects.qdoc b/doc/src/declarative/effects.qdoc
index c7cd2f6..e3c68bd 100644
--- a/doc/src/declarative/effects.qdoc
+++ b/doc/src/declarative/effects.qdoc
@@ -24,7 +24,7 @@ backends may be added if the performance can be made acceptable.
 \o \l Shadow
 \o \l Blur
 \o \l Reflection
-\o \l Highlights
+\o \l Highlight
 \o \l Particles
 \endlist
 
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc
index afc3726..8fff472 100644
--- a/doc/src/declarative/elements.qdoc
+++ b/doc/src/declarative/elements.qdoc
@@ -32,6 +32,7 @@ The following table lists the Qml elements provided by the Qt Declarative module
 \o \l SequentialAnimation
 \o \l ParallelAnimation
 \o \l SetPropertyAction
+\o \l ParentChangeAction
 \o \l Transition
 \o \l Behaviour
 \o \l Follow
@@ -67,6 +68,7 @@ The following table lists the Qml elements provided by the Qt Declarative module
 \o \l MouseRegion
 \o \l KeyActions
 \o \l AnimatedImage
+\o \l BlendedImage
 \endlist
 
 \o
@@ -101,6 +103,13 @@ The following table lists the Qml elements provided by the Qt Declarative module
 \o \l PathView
     \list
     \o \l Path
+        \list
+        \o \l PathLine
+        \o \l PathQuad
+        \o \l PathCubic
+        \o \l PathAttribute
+        \o \l PathPercent
+        \endlist
     \endlist
 \endlist
 
diff --git a/doc/src/declarative/pics/axisrotation.png b/doc/src/declarative/pics/axisrotation.png
new file mode 100644
index 0000000..409a9e9
--- /dev/null
+++ b/doc/src/declarative/pics/axisrotation.png
diff --git a/doc/src/declarative/qmlforcpp.qdoc b/doc/src/declarative/qmlforcpp.qdoc
index 7aa2560..f0675fe 100644
--- a/doc/src/declarative/qmlforcpp.qdoc
+++ b/doc/src/declarative/qmlforcpp.qdoc
@@ -545,7 +545,7 @@
     "signal properties", using the name "on<Signal Name>" where the first 
     character of the signal's name is uppercased.  If more than one signal of
     the same name is exist on a class, only the first is available (see the
-    \l {xmlConnection}{<Connection>} element for more general signal connections).
+    \l Connection element for more general signal connections).
 
     An important observation to make here is the lack of braces.  While both
     property bindings and signal properties involve executing ECMAScript code,
diff --git a/doc/src/declarative/tutorial1.qdoc b/doc/src/declarative/tutorial1.qdoc
index 15edaff..caadbf5 100644
--- a/doc/src/declarative/tutorial1.qdoc
+++ b/doc/src/declarative/tutorial1.qdoc
@@ -23,9 +23,9 @@ Here is the QML code for the application:
 <Rect id="Page" width="480" height="200" color="white">
 \endcode
 
-First, we declare a root element of type \l {xmlRect}{Rect}. It is one of the basic building blocks you can use to create an application in QML.
+First, we declare a root element of type \l Rect. It is one of the basic building blocks you can use to create an application in QML.
 We give it an id to be able to refer to it later. In this case, we call it \e Page. We also set the \c width, \c height and \c color properties. 
-The \l {xmlRect}{Rect} element contains many other properties (such as \c x and \c y), but these are left at their default values.
+The \l Rect element contains many other properties (such as \c x and \c y), but these are left at their default values.
 
 \section2 Text element
 
diff --git a/doc/src/declarative/tutorial2.qdoc b/doc/src/declarative/tutorial2.qdoc
index 8898e68..db846b8 100644
--- a/doc/src/declarative/tutorial2.qdoc
+++ b/doc/src/declarative/tutorial2.qdoc
@@ -53,7 +53,7 @@ The root element of our component is an \c Item. It is the most basic 'Fx' eleme
 </properties>
 \endcode
 
-We declare a \c color property. This property is accessible from  \i outside our component, this allows us to instantiate the cells with different colors.
+We declare a \c color property. This property is accessible from  \e outside our component, this allows us to instantiate the cells with different colors.
 
 \code
 <Rect anchors.fill="{parent}" color="{CellContainer.color}"/>
@@ -71,7 +71,7 @@ We bind the \c color property of this \c Rect to the color property of our compo
 
 In order to change the color of the text when clicking on a cell, we create a \c MouseRegion element with the same size as its parent.
 
-The \c onClick property sets the \c color property of the element named \i HelloText to our cell color.
+The \c onClick property sets the \c color property of the element named \e HelloText to our cell color.
 
 \section2 The main QML file
 
diff --git a/doc/src/images/declarative-nopercent.png b/doc/src/images/declarative-nopercent.png
new file mode 100644
index 0000000..28b00a9
--- /dev/null
+++ b/doc/src/images/declarative-nopercent.png
diff --git a/doc/src/images/declarative-pathattribute.png b/doc/src/images/declarative-pathattribute.png
new file mode 100644
index 0000000..04215db
--- /dev/null
+++ b/doc/src/images/declarative-pathattribute.png
diff --git a/doc/src/images/declarative-pathcubic.png b/doc/src/images/declarative-pathcubic.png
new file mode 100644
index 0000000..ffbca5d
--- /dev/null
+++ b/doc/src/images/declarative-pathcubic.png
diff --git a/doc/src/images/declarative-pathquad.png b/doc/src/images/declarative-pathquad.png
new file mode 100644
index 0000000..65f1999
--- /dev/null
+++ b/doc/src/images/declarative-pathquad.png
diff --git a/doc/src/images/declarative-percent.png b/doc/src/images/declarative-percent.png
new file mode 100644
index 0000000..c277055
--- /dev/null
+++ b/doc/src/images/declarative-percent.png