QQuickTableView: don't overwrite rebuildState

Since it's fully possible to end up calling invalidateTable() while
in the process of rebuilding the table, we need to ensure that we
don't mess with the current rebuildState. Instead, just schedule
that we need to rebuild once more later.

Change-Id: If27bb14f0bc9f72c53eb47e6115d7ad580cdb516
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

1 files changed, 3 insertions, 2 deletions

diff --git a/src/quick/items/qquicktableview_p_p.h b/src/quick/items/qquicktableview_p_p.h
index 53fd936195..1ba18480ba 100644
--- a/src/quick/items/qquicktableview_p_p.h
+++ b/src/quick/items/qquicktableview_p_p.h
@@ -164,7 +164,7 @@ public:
     };
 
     enum class RebuildState {
-        NotStarted = 0,
+        Begin = 0,
         LoadInitalTable,
         VerifyTable,
         LayoutTable,
@@ -208,7 +208,7 @@ public:
 
     QSize tableSize;
 
-    RebuildState rebuildState = RebuildState::NotStarted;
+    RebuildState rebuildState = RebuildState::Done;
     TableEdgeLoadRequest loadRequest;
 
     QPoint contentSizeBenchMarkPoint = QPoint(-1, -1);
@@ -221,6 +221,7 @@ public:
     bool columnRowPositionsInvalid = false;
     bool layoutWarningIssued = false;
     bool polishing = false;
+    bool rebuildScheduled = true;
 
     QJSValue rowHeightProvider;
     QJSValue columnWidthProvider;