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

5 files changed, 24 insertions, 8 deletions

diff --git a/doc/src/declarative/extending.qdoc b/doc/src/declarative/extending.qdoc
index db35961..b872632 100644
--- a/doc/src/declarative/extending.qdoc
+++ b/doc/src/declarative/extending.qdoc
@@ -300,11 +300,22 @@ attachment object are those that become available for use as the attached
 property block.
 
 Any QML type can become an attaching type by declaring the
-\c qmlAttachedProperties() public function:
+\c qmlAttachedProperties() public function and declaring that the class has
+QML_HAS_ATTACHED_PROPERTIES:
 
 \quotation
 \code
-static AttachedPropertiesType *qmlAttachedProperties(QObject *object)
+class MyType : public QObject {
+    Q_OBJECT
+public:
+
+    ...
+
+    static AttachedPropertiesType *qmlAttachedProperties(QObject *object);
+};
+
+QML_DECLARE_TYPEINFO(MyType, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPE(MyType)
 \endcode
 Return an attachment object, of type \a AttachedPropertiesType, for the
 attachee \a object instance.  It is customary, though not strictly required, for
diff --git a/doc/src/declarative/pics/3d-rotation-axis.png b/doc/src/declarative/pics/3d-rotation-axis.png
index 1b17261..b940215 100644
--- a/doc/src/declarative/pics/3d-rotation-axis.png
+++ b/doc/src/declarative/pics/3d-rotation-axis.png
diff --git a/doc/src/declarative/pics/axisrotation.png b/doc/src/declarative/pics/axisrotation.png
index 409a9e9..4cddcdf 100644
--- a/doc/src/declarative/pics/axisrotation.png
+++ b/doc/src/declarative/pics/axisrotation.png
diff --git a/doc/src/declarative/qtdeclarative.qdoc b/doc/src/declarative/qtdeclarative.qdoc
index 7be98db..ba2d70e 100644
--- a/doc/src/declarative/qtdeclarative.qdoc
+++ b/doc/src/declarative/qtdeclarative.qdoc
@@ -84,6 +84,7 @@ completely new applications.  QML is fully \l {Extending QML}{extensible from C+
 \o \l {QML Documents}
 \o \l {Property Binding}
 \o \l {ECMAScript Blocks}
+\o \l {QML Scope}
 \o \l {Network Transparency}
 \o \l {qmlmodels}{Data Models}
 \o \l {anchor-layout}{Anchor-based Layout}
diff --git a/doc/src/snippets/declarative/rotation.qml b/doc/src/snippets/declarative/rotation.qml
index aaaebee..4a67dcb 100644
--- a/doc/src/snippets/declarative/rotation.qml
+++ b/doc/src/snippets/declarative/rotation.qml
@@ -4,25 +4,29 @@ Rectangle {
     width: 360; height: 80
     color: "white"
 //! [0]
-    HorizontalLayout {
-        margin: 10
+    Row {
+        x: 10; y: 10
         spacing: 10
         Image { source: "pics/qt.png" }
         Image {
             source: "pics/qt.png"
-            transform: Rotation { origin.x: 30; axis.y: 60; axis.z: 0 angle: 18 }
+            transform: Rotation { origin.x: 30; origin.y: 30; axis { x: 0; y: 1; z: 0 } angle: 18 }
+            smooth: true
         }
         Image {
             source: "pics/qt.png"
-            transform: Rotation { origin.x: 30; axis.y: 60; axis.z: 0 angle: 36 }
+            transform: Rotation { origin.x: 30; origin.y: 30; axis { x: 0; y: 1; z: 0 } angle: 36 }
+            smooth: true
         }
         Image {
             source: "pics/qt.png"
-            transform: Rotation { origin.x: 30; axis.y: 60; axis.z: 0; angle: 54 }
+            transform: Rotation { origin.x: 30; origin.y: 30; axis { x: 0; y: 1; z: 0 } angle: 54 }
+            smooth: true
         }
         Image {
             source: "pics/qt.png"
-            transform: Rotation { origin.x: 30; axis.y: 60; axis.z: 0; angle: 72 }
+            transform: Rotation { origin.x: 30; origin.y: 30; axis { x: 0; y: 1; z: 0 } angle: 72 }
+            smooth: true
         }
     }
 //! [0]