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

Conflicts:
	doc/src/snippets/declarative/repeater.qml

1 files changed, 8 insertions, 7 deletions

diff --git a/doc/src/snippets/declarative/repeater.qml b/doc/src/snippets/declarative/repeater.qml
index cb7a069..f8ac856 100644
--- a/doc/src/snippets/declarative/repeater.qml
+++ b/doc/src/snippets/declarative/repeater.qml
@@ -1,15 +1,16 @@
 import Qt 4.6
 
-//! [0]
-Rectangle { 
+Rectangle {
     width: 220; height: 20; color: "white"
-    Component { id: Dot
-        Rectangle { width: 20; height: 20; radius: 10; color: "green" }
-    }
+
+//! [0]
     Row {
         Rectangle { width: 10; height: 20; color: "red" }
-        Repeater { delegate: Dot; model: 10 }
+        Repeater {
+            model: 10 
+            Rectangle { width: 20; height: 20; radius: 10; color: "green" }
+        }
         Rectangle { width: 10; height: 20; color: "blue" }
     }
-}
 //! [0]
+}