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

4 files changed, 166 insertions, 2 deletions

diff --git a/tests/auto/quick/qquicktableview/data/checkalwaysemit.qml b/tests/auto/quick/qquicktableview/data/checkalwaysemit.qml
new file mode 100644
index 0000000000..33db6f6d02
--- /dev/null
+++ b/tests/auto/quick/qquicktableview/data/checkalwaysemit.qml
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtQuick module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.12
+import QtQuick.Window 2.3
+
+Item {
+    width: 640
+    height: 450
+
+    property alias tableView: tableView
+    property real delegateWidth: 100
+    property real delegateHeight: 50
+    property Component delegate: tableViewDelegate
+    property bool delegateParentSetBeforeCompleted: false
+
+    TableView {
+        id: tableView
+        width: 600
+        height: 400
+        anchors.margins: 1
+        clip: true
+        delegate: tableViewDelegate
+        columnSpacing: 1
+        rowSpacing: 1
+    }
+
+    Component {
+        id: tableViewDelegate
+        Rectangle {
+            objectName: "tableViewDelegate"
+            implicitWidth: delegateWidth
+            implicitHeight: delegateHeight
+            color: "lightgray"
+            border.width: 1
+
+            property string modelDataFromIndex: tableView.model.dataFromSerializedIndex(index)
+            property string modelDataBinding: modelData
+
+            Text {
+                anchors.centerIn: parent
+                text: modelData
+            }
+
+            Component.onCompleted: {
+                delegateParentSetBeforeCompleted = parent != null;
+            }
+        }
+    }
+
+}
diff --git a/tests/auto/quick/qquicktableview/data/plaintableview.qml b/tests/auto/quick/qquicktableview/data/plaintableview.qml
index 33db6f6d02..90271eda71 100644
--- a/tests/auto/quick/qquicktableview/data/plaintableview.qml
+++ b/tests/auto/quick/qquicktableview/data/plaintableview.qml
@@ -70,7 +70,6 @@ Item {
             color: "lightgray"
             border.width: 1
 
-            property string modelDataFromIndex: tableView.model.dataFromSerializedIndex(index)
             property string modelDataBinding: modelData
 
             Text {
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"
+        }
+    }
+}
diff --git a/tests/auto/quick/qquicktableview/tst_qquicktableview.cpp b/tests/auto/quick/qquicktableview/tst_qquicktableview.cpp
index 6ae095a7d6..10004bb775 100644
--- a/tests/auto/quick/qquicktableview/tst_qquicktableview.cpp
+++ b/tests/auto/quick/qquicktableview/tst_qquicktableview.cpp
@@ -177,6 +177,7 @@ private slots:
     void checkSyncView_connect_late();
     void delegateWithRequiredProperties();
     void checkThatFetchMoreIsCalledWhenScrolledToTheEndOfTable();
+    void replaceModel();
 };
 
 tst_QQuickTableView::tst_QQuickTableView()
@@ -2094,7 +2095,7 @@ void tst_QQuickTableView::checkThatWeAlwaysEmitChangedUponItemReused()
     // any data referred to by the index property inside the delegate
     // will change too. So we need to refresh any bindings to index.
     // QTBUG-79209
-    LOAD_TABLEVIEW("plaintableview.qml");
+    LOAD_TABLEVIEW("checkalwaysemit.qml");
 
     TestModel model(1, 1);
     tableView->setModel(QVariant::fromValue(&model));
@@ -2745,6 +2746,20 @@ void tst_QQuickTableView::delegateWithRequiredProperties()
     }
 }
 
+void tst_QQuickTableView::replaceModel()
+{
+    LOAD_TABLEVIEW("replaceModelTableView.qml");
+
+    tableView->setProperty("modelId", 0);
+    QTRY_COMPARE(tableView->rows(), 2);
+    tableView->setProperty("modelId", 1);
+    QTRY_COMPARE(tableView->rows(), 0);
+    tableView->setProperty("modelId", 2);
+    QTRY_COMPARE(tableView->rows(), 0);
+    tableView->setProperty("modelId", 0);
+    QTRY_COMPARE(tableView->rows(), 2);
+}
+
 QTEST_MAIN(tst_QQuickTableView)
 
 #include "tst_qquicktableview.moc"