Merge branch '5.3' into dev

Conflicts:
	src/quick/items/context2d/qquickcontext2d.cpp
	src/quick/items/context2d/qquickcontext2dtexture.cpp

Change-Id: I1a9b911b3a92333a5dddbaf43275f71bad2006f0

2 files changed, 98 insertions, 0 deletions

diff --git a/tests/auto/quick/qquicklistview/data/layoutChangeSort.qml b/tests/auto/quick/qquicklistview/data/layoutChangeSort.qml
new file mode 100644
index 0000000000..e54f164e45
--- /dev/null
+++ b/tests/auto/quick/qquicklistview/data/layoutChangeSort.qml
@@ -0,0 +1,58 @@
+import QtQuick 2.0
+import QtQml.Models 2.1
+
+Rectangle {
+    id: root
+    width: 240
+    height: 320
+    color: "#ffffff"
+
+
+    Component {
+        id: myDelegate
+        Rectangle {
+            id: wrapper
+            objectName: "wrapper"
+            height: 20
+            width: 240
+            Text {
+                objectName: "delegateText"
+                text: display
+            }
+            color: ListView.isCurrentItem ? "lightsteelblue" : "white"
+        }
+    }
+
+    DelegateModel {
+        id: delegateModel
+        objectName: "delegateModel"
+        model: testModel
+        delegate: myDelegate
+    }
+
+    ListView {
+        id: list
+        objectName: "listView"
+        model: delegateModel;
+        focus: true
+        anchors.fill: parent
+
+
+        section {
+            property: "SortRole";
+            delegate: Rectangle {
+                width: parent.width;
+                height: 20;
+                color: "steelblue";
+
+                Text {
+                    anchors {
+                        fill: parent;
+                        margins: 5;
+                    }
+                    text: section;
+                }
+            }
+        }
+    }
+}
diff --git a/tests/auto/quick/qquicklistview/data/qtbug39492.qml b/tests/auto/quick/qquicklistview/data/qtbug39492.qml
new file mode 100644
index 0000000000..4df3a080d7
--- /dev/null
+++ b/tests/auto/quick/qquicklistview/data/qtbug39492.qml
@@ -0,0 +1,40 @@
+import QtQuick 2.0
+import QtQml.Models 2.1
+
+Rectangle {
+    id: root
+    width: 240
+    height: 320
+    color: "#ffffff"
+
+
+    Component {
+        id: myDelegate
+        Rectangle {
+            id: wrapper
+            objectName: "wrapper"
+            height: 20
+            width: 240
+            Text {
+                objectName: "delegateText"
+                text: display
+            }
+            color: ListView.isCurrentItem ? "lightsteelblue" : "white"
+        }
+    }
+
+    DelegateModel {
+        id: delegateModel
+        objectName: "delegateModel"
+        model: testModel
+        delegate: myDelegate
+    }
+
+    ListView {
+        id: list
+        objectName: "listView"
+        model: delegateModel;
+        focus: true
+        anchors.fill: parent
+    }
+}