Merge remote-tracking branch 'origin/5.14' into 5.15

 Conflicts:
	src/quick/items/qquickitemview.cpp

Change-Id: Ib9faebdbef5eebb80f4e6aeb5b15b5df7494b157

2 files changed, 50 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()
+        }
+    }
+}
diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
index e527853148..9a8dfee9d2 100644
--- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
+++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
@@ -289,6 +289,7 @@ private slots:
     void reuse_reuseIsOffByDefault();
     void reuse_checkThatItemsAreReused();
     void moveObjectModelItemToAnotherObjectModel();
+    void changeModelAndDestroyTheOldOne();
 
 private:
     template <class T> void items(const QUrl &source);
@@ -9415,6 +9416,21 @@ void tst_QQuickListView::moveObjectModelItemToAnotherObjectModel()
     QVERIFY(!QQuickItemPrivate::get(redRect)->culled);
 }
 
+void tst_QQuickListView::changeModelAndDestroyTheOldOne()  // QTBUG-80203
+{
+    QScopedPointer<QQuickView> window(createView());
+    window->setSource(testFileUrl("changeModelAndDestroyTheOldOne.qml"));
+    window->resize(640, 480);
+    window->show();
+    QVERIFY(QTest::qWaitForWindowExposed(window.data()));
+
+    QQuickItem *root = window->rootObject();
+    QVERIFY(root);
+
+    QVERIFY(QQuickTest::qWaitForItemPolished(root));
+    // no crash
+}
+
 QTEST_MAIN(tst_QQuickListView)
 
 #include "tst_qquicklistview.moc"