Merge branch 'kinetic-declarativeui' of git://git-nokia.trolltech.com.au/qtsoftware/qt/kinetic

Conflicts:
	src/xmlpatterns/type/qprimitives_p.h
	tools/linguist/lupdate/main.cpp

1 files changed, 28 insertions, 0 deletions

diff --git a/tests/auto/declarative/qmlgraphicsrepeater/data/repeater.qml b/tests/auto/declarative/qmlgraphicsrepeater/data/repeater.qml
new file mode 100644
index 0000000..7d83230
--- /dev/null
+++ b/tests/auto/declarative/qmlgraphicsrepeater/data/repeater.qml
@@ -0,0 +1,28 @@
+import Qt 4.6
+
+Rectangle {
+    id: container
+    objectName: "container"
+    width: 240
+    height: 320
+    color: "white"
+    Text {
+        text: "Zero"
+    }
+    Repeater {
+        id: repeater
+        objectName: "repeater"
+        width: 240
+        height: 320
+        model: testData
+        Component {
+            Text {
+                y: index*20
+                text: modelData
+            }
+        }
+    }
+    Text {
+        text: "Last"
+    }
+}