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

 Conflicts:
	tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
	tests/auto/quick/qquicktableview/tst_qquicktableview.cpp

Change-Id: Ib46bc1c717cf524eea2fb3d876810c8d55747c91

1 files changed, 63 insertions, 0 deletions

diff --git a/tests/auto/quick/qquicktableview/data/replaceModelTableView.qml b/tests/auto/quick/qquicktableview/data/replaceModelTableView.qml
new file mode 100644
index 0000000000..2b17e055a7
--- /dev/null
+++ b/tests/auto/quick/qquicktableview/data/replaceModelTableView.qml
@@ -0,0 +1,63 @@
+import QtQuick 2.14
+import QtQml.Models 2.14
+
+Item {
+    id: root
+    visible: true
+    width: 640
+    height: 480
+
+    property alias tableView: tv
+
+    ObjectModel {
+        id: om
+        Rectangle { height: 30; width: 80; color: "red" }
+        Rectangle { height: 30; width: 80; color: "green" }
+        Rectangle { height: 30; width: 80; color: "blue" }
+    }
+
+    ListModel {
+        id: lm
+        ListElement { name: "1" }
+        ListElement { name: "44"}
+    }
+
+    DelegateModel {
+       id: dm
+       model: ListModel {
+           ListElement { name: "Apple" }
+           ListElement { name: "Orange" }
+       }
+       delegate: Rectangle {
+           height: 25
+           width: 100
+           Text { text: "Name: " + name}
+       }
+    }
+    TableView {
+        id: tv
+        visible: true
+        anchors.fill: parent
+        property int modelId: 0
+
+        model: {
+            switch (modelId) {
+            case 0:  return lm;
+            case 1:  return om;
+            case 2:  return dm;
+            default: return null;
+            }
+        }
+
+        delegate: Rectangle {
+            id: dlg
+            implicitWidth: 40
+            implicitHeight: 20
+            color: "red"
+            Text {
+                text: qsTr("name: " + name)
+            }
+            border.color: "green"
+        }
+    }
+}