Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	src/qml/compiler/qv4ssa.cpp
	src/qml/jsruntime/qv4arrayobject.cpp
	src/qml/jsruntime/qv4context.cpp

Change-Id: Ied5b23bec4dc14abe51127c507aed668f855c1e1

1 files changed, 20 insertions, 0 deletions

diff --git a/tests/auto/quick/qquicklistview/data/headerCrash.qml b/tests/auto/quick/qquicklistview/data/headerCrash.qml
new file mode 100644
index 0000000000..124fa894f2
--- /dev/null
+++ b/tests/auto/quick/qquicklistview/data/headerCrash.qml
@@ -0,0 +1,20 @@
+import QtQuick 2.0
+
+ListView {
+    id: myList
+
+    width: 400; height: 400
+    model: 10
+
+    header: Item {
+        height: parent ? 20 : 10
+        width: 400
+    }
+
+    delegate: Rectangle {
+        width: parent.width; height: 20
+        color: index % 2 ? "green" : "red"
+    }
+
+    Component.onCompleted: myList.verticalLayoutDirection = ListView.BottomToTop
+}