Merge 5.14 into 5.14.1v5.14.1

Change-Id: Iefb900b42cc0476e62342724a5f3a480c09ce354

1 files changed, 34 insertions, 0 deletions

diff --git a/tests/auto/quick/qquicklistview/data/changeModelAndDestroyTheOldOne.qml b/tests/auto/quick/qquicklistview/data/changeModelAndDestroyTheOldOne.qml
new file mode 100644
index 0000000000..6a33decde6
--- /dev/null
+++ b/tests/auto/quick/qquicklistview/data/changeModelAndDestroyTheOldOne.qml
@@ -0,0 +1,34 @@
+import QtQuick 2.13
+import QtQml 2.13
+import QtQml.Models 2.13
+
+Rectangle {
+    width: 640
+    height: 480
+    property var model1: null
+    property var model2: null
+    Component {
+        id: m1
+        ObjectModel {
+            Rectangle { height: 30; width: 80; color: "red" }
+            Rectangle { height: 30; width: 80; color: "green" }
+            Rectangle { height: 30; width: 80; color: "blue" }
+        }
+    }
+    Component {
+        id: m2
+        ObjectModel {
+            Rectangle { height: 30; width: 80; color: "red" }
+        }
+    }
+    ListView {
+        anchors.fill: parent
+        Component.onCompleted: {
+            model1 = m1.createObject()
+            model = model1
+            model2 = m2.createObject()
+            model = model2
+            model1.destroy()
+        }
+    }
+}