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

Change-Id: Ic2cea85917751b89c34768fd80d8b11f5706dd62

1 files changed, 17 insertions, 8 deletions

diff --git a/src/quick/items/qquicktableview.cpp b/src/quick/items/qquicktableview.cpp
index fd511bc2ee..66e89f0a09 100644
--- a/src/quick/items/qquicktableview.cpp
+++ b/src/quick/items/qquicktableview.cpp
@@ -2242,6 +2242,21 @@ void QQuickTableViewPrivate::syncDelegate()
         tableModel->setDelegate(assignedDelegate);
 }
 
+QVariant QQuickTableViewPrivate::modelImpl() const
+{
+    return assignedModel;
+}
+
+void QQuickTableViewPrivate::setModelImpl(const QVariant &newModel)
+{
+    if (newModel == assignedModel)
+        return;
+
+    assignedModel = newModel;
+    scheduleRebuildTable(QQuickTableViewPrivate::RebuildOption::All);
+    emit q_func()->modelChanged();
+}
+
 void QQuickTableViewPrivate::syncModel()
 {
     if (modelVariant == assignedModel)
@@ -2663,18 +2678,12 @@ void QQuickTableView::setColumnWidthProvider(const QJSValue &provider)
 
 QVariant QQuickTableView::model() const
 {
-    return d_func()->assignedModel;
+    return d_func()->modelImpl();
 }
 
 void QQuickTableView::setModel(const QVariant &newModel)
 {
-    Q_D(QQuickTableView);
-    if (newModel == d->assignedModel)
-        return;
-
-    d->assignedModel = newModel;
-    d->scheduleRebuildTable(QQuickTableViewPrivate::RebuildOption::All);
-    emit modelChanged();
+    return d_func()->setModelImpl(newModel);
 }
 
 QQmlComponent *QQuickTableView::delegate() const