Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/quick/items/qquickitem.cpp
	tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
	tests/auto/quick/qquicklistview/tst_qquicklistview.cpp

Change-Id: I3cf47faa2fe567d62fffd985aeecbefe5811cc42

1 files changed, 30 insertions, 0 deletions

diff --git a/tests/auto/quick/qquickgridview/data/qtbug48870.qml b/tests/auto/quick/qquickgridview/data/qtbug48870.qml
new file mode 100644
index 0000000000..7c0783fbb5
--- /dev/null
+++ b/tests/auto/quick/qquickgridview/data/qtbug48870.qml
@@ -0,0 +1,30 @@
+import QtQuick 2.6
+
+Rectangle {
+    width: 500
+    height: 500
+    color: "blue"
+
+    GridView {
+        id: view
+        objectName: "view"
+        anchors.fill: parent
+        model: testModel
+        cellWidth: 150
+        cellHeight: 150
+        readonly property int columns: Math.floor(width / cellWidth)
+
+        delegate: Rectangle {
+            width: GridView.view.cellWidth
+            height: GridView.view.cellHeight
+            color: (row & 1) != (col & 1) ? "green" : "red"
+            readonly property int row: index / view.columns
+            readonly property int col: index % view.columns
+
+            Text {
+                anchors.centerIn: parent
+                text: "Item " + index
+            }
+        }
+    }
+}