Merge branch 'master' into refactor

Conflicts:
	src/declarative/items/qsgcanvas.cpp
	src/declarative/items/qsgitem.cpp
	src/declarative/items/qsgtextnode.cpp
	tests/auto/declarative/examples/examples.pro
	tools/qmlviewer/qmlviewer.pro

Change-Id: Icbb0ef5dc79b658c62fd2b2c25a66c9bb3cbeb10

1 files changed, 50 insertions, 0 deletions

diff --git a/tests/auto/declarative/qsgpositioners/data/attachedproperties-column.qml b/tests/auto/declarative/qsgpositioners/data/attachedproperties-column.qml
new file mode 100644
index 0000000000..4c667aa205
--- /dev/null
+++ b/tests/auto/declarative/qsgpositioners/data/attachedproperties-column.qml
@@ -0,0 +1,50 @@
+import QtQuick 2.0
+
+Rectangle {
+  width: 100
+  height: 200
+
+  Column {
+
+    Rectangle {
+      width: 100
+      height: 100
+      color: 'red'
+      visible: false
+    }
+
+    Rectangle {
+      objectName: "greenRect"
+      width: 100
+      height: 100
+      color: 'green'
+      property int posIndex: Positioner.index
+      property bool isFirstItem: Positioner.isFirstItem
+      property bool isLastItem: Positioner.isLastItem
+    }
+
+    Rectangle {
+      width: 100
+      height: 100
+      color: 'blue'
+      visible: false
+    }
+
+    Rectangle {
+      objectName: "yellowRect"
+      width: 100
+      height: 100
+      color: 'yellow'
+
+      property int posIndex: -1
+      property bool isFirstItem: false
+      property bool isLastItem: false
+
+      function onDemandPositioner() {
+        posIndex = Positioner.index;
+        isFirstItem = Positioner.isFirstItem
+        isLastItem = Positioner.isLastItem
+      }
+    }
+  }
+}