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

 Conflicts:
	src/qml/jsruntime/qv4engine.cpp
	src/quick/handlers/qquicktaphandler.cpp
	src/quick/items/qquicktableview.cpp

Done-With: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Done-With: Ulf Hermann <ulf.hermann@qt.io>
Done-With: Shawn Rutledge <shawn.rutledge@qt.io>
Change-Id: If9558a33f01693ce96420c094e0b57dfff0626cd

1 files changed, 3 insertions, 12 deletions

diff --git a/src/quick/items/qquicktableview.cpp b/src/quick/items/qquicktableview.cpp
index 75e0a1018f..db579c74bc 100644
--- a/src/quick/items/qquicktableview.cpp
+++ b/src/quick/items/qquicktableview.cpp
@@ -1823,18 +1823,9 @@ void QQuickTableViewPrivate::beginRebuildTable()
 
 void QQuickTableViewPrivate::layoutAfterLoadingInitialTable()
 {
-    if (rebuildOptions.testFlag(RebuildOption::LayoutOnly)
-            || rowHeightProvider.isUndefined() || columnWidthProvider.isUndefined()) {
-        // Since we don't have both size providers, we need to calculate the
-        // size of each row and column based on the size of the delegate items.
-        // This couldn't be done while we were loading the initial rows and
-        // columns, since during the process, we didn't have all the items
-        // available yet for the calculation. So we do it now. The exception
-        // is if we specifically only requested a relayout.
-        clearEdgeSizeCache();
-        relayoutTableItems();
-        syncLoadedTableRectFromLoadedTable();
-    }
+    clearEdgeSizeCache();
+    relayoutTableItems();
+    syncLoadedTableRectFromLoadedTable();
 
     if (syncView || rebuildOptions.testFlag(RebuildOption::All)) {
         // We try to limit how often we update the content size. The main reason is that is has a