4 files changed, 21 insertions, 11 deletions
diff --git a/src/qml/types/qqmltableinstancemodel.cpp b/src/qml/types/qqmltableinstancemodel.cpp
index 6604e009c1..536dd46182 100644
--- a/src/qml/types/qqmltableinstancemodel.cpp
+++ b/src/qml/types/qqmltableinstancemodel.cpp
@@ -437,7 +437,26 @@ void QQmlTableInstanceModel::setModel(const QVariant &model)
     // needs to stay in sync with the model. So we need to drain the pool
     // completely when the model changes.
     drainReusableItemsPool(0);
+    if (auto const aim = abstractItemModel())
+        disconnect(aim, &QAbstractItemModel::dataChanged, this, &QQmlTableInstanceModel::dataChangedCallback);
     m_adaptorModel.setModel(model, this, m_qmlContext->engine());
+    if (auto const aim = abstractItemModel())
+        connect(aim, &QAbstractItemModel::dataChanged, this, &QQmlTableInstanceModel::dataChangedCallback);
+}
+
+void QQmlTableInstanceModel::dataChangedCallback(const QModelIndex &begin, const QModelIndex &end, const QVector<int> &roles)
+{
+    // This function is called when model data has changed. In that case, we tell the adaptor model
+    // to go through all the items we have created, find the ones that are affected, and notify that
+    // their model data has changed. This will in turn update QML bindings inside the delegate items.
+    int numberOfRowsChanged = end.row() - begin.row() + 1;
+    int numberOfColumnsChanged = end.column() - begin.column() + 1;
+
+    for (int column = 0; column < numberOfColumnsChanged; ++column) {
+        const int columnIndex = begin.column() + column;
+        const int rowIndex = begin.row() + (columnIndex * rows());
+        m_adaptorModel.notify(m_modelItems.values(), rowIndex, numberOfRowsChanged, roles);
+    }
 }
 
 QQmlComponent *QQmlTableInstanceModel::delegate() const
diff --git a/src/qml/types/qqmltableinstancemodel_p.h b/src/qml/types/qqmltableinstancemodel_p.h
index 23243e7f0e..71689ce6da 100644
--- a/src/qml/types/qqmltableinstancemodel_p.h
+++ b/src/qml/types/qqmltableinstancemodel_p.h
@@ -142,6 +142,8 @@ private:
     void deleteAllFinishedIncubationTasks();
     QQmlDelegateModelItem *resolveModelItem(int index);
 
+    void dataChangedCallback(const QModelIndex &begin, const QModelIndex &end, const QVector<int> &roles);
+
     static bool isDoneIncubating(QQmlDelegateModelItem *modelItem);
     static void deleteModelItemLater(QQmlDelegateModelItem *modelItem);
 
diff --git a/src/quick/items/qquicktableview.cpp b/src/quick/items/qquicktableview.cpp
index 8e9cc4318e..19e04b212b 100644
--- a/src/quick/items/qquicktableview.cpp
+++ b/src/quick/items/qquicktableview.cpp
@@ -1166,7 +1166,6 @@ void QQuickTableViewPrivate::connectToModel()
         // be our own QQmlTableInstanceModel, which doesn't bother creating change sets at all. For models that are
         // not based on QAIM (like QQmlObjectModel, QQmlListModel, javascript arrays etc), there is currently no way
         // to modify the model at runtime without also re-setting the model on the view.
-        connect(aim, &QAbstractItemModel::dataChanged, this, &QQuickTableViewPrivate::dataChangedCallback);
         connect(aim, &QAbstractItemModel::rowsMoved, this, &QQuickTableViewPrivate::rowsMovedCallback);
         connect(aim, &QAbstractItemModel::columnsMoved, this, &QQuickTableViewPrivate::columnsMovedCallback);
         connect(aim, &QAbstractItemModel::rowsInserted, this, &QQuickTableViewPrivate::rowsInsertedCallback);
@@ -1192,7 +1191,6 @@ void QQuickTableViewPrivate::disconnectFromModel()
     }
 
     if (auto const aim = model->abstractItemModel()) {
-        disconnect(aim, &QAbstractItemModel::dataChanged, this, &QQuickTableViewPrivate::dataChangedCallback);
         disconnect(aim, &QAbstractItemModel::rowsMoved, this, &QQuickTableViewPrivate::rowsMovedCallback);
         disconnect(aim, &QAbstractItemModel::columnsMoved, this, &QQuickTableViewPrivate::columnsMovedCallback);
         disconnect(aim, &QAbstractItemModel::rowsInserted, this, &QQuickTableViewPrivate::rowsInsertedCallback);
@@ -1214,14 +1212,6 @@ void QQuickTableViewPrivate::modelUpdated(const QQmlChangeSet &changeSet, bool r
     invalidateTable();
 }
 
-void QQuickTableViewPrivate::dataChangedCallback(const QModelIndex &begin, const QModelIndex &, const QVector<int> &)
-{
-    if (begin.parent() != QModelIndex())
-        return;
-
-    invalidateTable();
-}
-
 void QQuickTableViewPrivate::rowsMovedCallback(const QModelIndex &parent, int, int, const QModelIndex &, int )
 {
     if (parent != QModelIndex())
diff --git a/src/quick/items/qquicktableview_p_p.h b/src/quick/items/qquicktableview_p_p.h
index 7e8561850a..b61093e55d 100644
--- a/src/quick/items/qquicktableview_p_p.h
+++ b/src/quick/items/qquicktableview_p_p.h
@@ -300,7 +300,6 @@ public:
     void connectToModel();
     void disconnectFromModel();
 
-    void dataChangedCallback(const QModelIndex &begin, const QModelIndex &end, const QVector<int> &roles);
     void rowsMovedCallback(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row);
     void columnsMovedCallback(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column);
     void rowsInsertedCallback(const QModelIndex &parent, int begin, int end);