aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/quick/items/qquicktableview.cpp8
-rw-r--r--src/quick/items/qquicktableview_p_p.h1
2 files changed, 3 insertions, 6 deletions
diff --git a/src/quick/items/qquicktableview.cpp b/src/quick/items/qquicktableview.cpp
index 17bdeed1fb..12faac8127 100644
--- a/src/quick/items/qquicktableview.cpp
+++ b/src/quick/items/qquicktableview.cpp
@@ -1704,7 +1704,6 @@ void QQuickTableViewPrivate::scheduleRebuildTable(RebuildOptions options) {
return;
}
- rebuildScheduled = true;
scheduledRebuildOptions |= options;
q_func()->polish();
}
@@ -1758,7 +1757,7 @@ void QQuickTableViewPrivate::updatePolish()
void QQuickTableViewPrivate::fixup(QQuickFlickablePrivate::AxisData &data, qreal minExtent, qreal maxExtent)
{
- if (rebuildScheduled || rebuildState != RebuildState::Done)
+ if (scheduledRebuildOptions || rebuildState != RebuildState::Done)
return;
QQuickFlickablePrivate::fixup(data, minExtent, maxExtent);
@@ -1850,13 +1849,12 @@ void QQuickTableViewPrivate::syncWithPendingChanges()
void QQuickTableViewPrivate::syncRebuildOptions()
{
- if (!rebuildScheduled)
+ if (!scheduledRebuildOptions)
return;
rebuildState = RebuildState::Begin;
rebuildOptions = scheduledRebuildOptions;
scheduledRebuildOptions = RebuildOption::None;
- rebuildScheduled = false;
if (loadedItems.isEmpty()) {
// If we have no items from before, we cannot just rebuild the viewport, but need
@@ -2245,7 +2243,7 @@ void QQuickTableView::viewportMoved(Qt::Orientations orientation)
d->scheduleRebuildTable(options);
}
- if (d->rebuildScheduled) {
+ if (d->scheduledRebuildOptions) {
// No reason to do anything, since we're about to rebuild the whole table anyway.
// Besides, calling updatePolish, which will start the rebuild, can easily cause
// binding loops to happen since we usually end up modifying the geometry of the
diff --git a/src/quick/items/qquicktableview_p_p.h b/src/quick/items/qquicktableview_p_p.h
index f2fef0d774..53bd6ec973 100644
--- a/src/quick/items/qquicktableview_p_p.h
+++ b/src/quick/items/qquicktableview_p_p.h
@@ -249,7 +249,6 @@ public:
bool columnRowPositionsInvalid = false;
bool layoutWarningIssued = false;
bool polishing = false;
- bool rebuildScheduled = true;
QJSValue rowHeightProvider;
QJSValue columnWidthProvider;