1 files changed, 15 insertions, 0 deletions
diff --git a/src/quick/items/qquicktableview.cpp b/src/quick/items/qquicktableview.cpp
index 9583ef4231..75e0a1018f 100644
--- a/src/quick/items/qquicktableview.cpp
+++ b/src/quick/items/qquicktableview.cpp
@@ -432,6 +432,10 @@ bool QQuickTableViewPrivate::EdgeRange::containsIndex(Qt::Edge edge, int index)
 QQuickTableViewPrivate::QQuickTableViewPrivate()
     : QQuickFlickablePrivate()
 {
+    QObject::connect(&columnWidths, &QQuickTableSectionSizeProvider::sizeChanged,
+                            [this] { this->forceLayout();});
+    QObject::connect(&rowHeights, &QQuickTableSectionSizeProvider::sizeChanged,
+                            [this] { this->forceLayout();});
 }
 
 QQuickTableViewPrivate::~QQuickTableViewPrivate()
@@ -868,6 +872,9 @@ void QQuickTableViewPrivate::syncLoadedTableRectFromLoadedTable()
 
 void QQuickTableViewPrivate::forceLayout()
 {
+    if (loadedItems.isEmpty())
+        return;
+
     clearEdgeSizeCache();
     RebuildOptions rebuildOptions = RebuildOption::LayoutOnly;
 
@@ -1277,6 +1284,10 @@ qreal QQuickTableViewPrivate::getColumnWidth(int column)
     if (syncHorizontally)
         return syncView->d_func()->getColumnWidth(column);
 
+    auto cw = columnWidths.size(column);
+    if (cw >= 0)
+        return cw;
+
     if (columnWidthProvider.isUndefined())
         return noExplicitColumnWidth;
 
@@ -1314,6 +1325,10 @@ qreal QQuickTableViewPrivate::getRowHeight(int row)
     if (syncVertically)
         return syncView->d_func()->getRowHeight(row);
 
+    auto rh = rowHeights.size(row);
+    if (rh >= 0)
+        return rh;
+
     if (rowHeightProvider.isUndefined())
         return noExplicitRowHeight;