1 files changed, 12 insertions, 9 deletions
diff --git a/src/quick/items/qquicktableview.cpp b/src/quick/items/qquicktableview.cpp
index 4926d81cfe..9b1704421c 100644
--- a/src/quick/items/qquicktableview.cpp
+++ b/src/quick/items/qquicktableview.cpp
@@ -529,10 +529,10 @@ int QQuickTableViewPrivate::nextVisibleEdgeIndexAroundLoadedTable(Qt::Edge edge)
     // visible, and should be loaded next if the content item moves.
     int startIndex = -1;
     switch (edge) {
-    case Qt::LeftEdge: startIndex = loadedColumns.firstKey() - 1; break;
-    case Qt::RightEdge: startIndex = loadedColumns.lastKey() + 1; break;
-    case Qt::TopEdge: startIndex = loadedRows.firstKey() - 1; break;
-    case Qt::BottomEdge: startIndex = loadedRows.lastKey() + 1; break;
+    case Qt::LeftEdge: startIndex = leftColumn() - 1; break;
+    case Qt::RightEdge: startIndex = rightColumn() + 1; break;
+    case Qt::TopEdge: startIndex = topRow() - 1; break;
+    case Qt::BottomEdge: startIndex = bottomRow() + 1; break;
     }
 
     return nextVisibleEdgeIndex(edge, startIndex);
@@ -1922,7 +1922,7 @@ void QQuickTableViewPrivate::loadEdge(Qt::Edge edge, QQmlIncubator::IncubationMo
     const int edgeIndex = nextVisibleEdgeIndexAroundLoadedTable(edge);
     qCDebug(lcTableViewDelegateLifecycle) << edge << edgeIndex;
 
-    const QList<int> visibleCells = edge & (Qt::LeftEdge | Qt::RightEdge)
+    const auto visibleCells = edge & (Qt::LeftEdge | Qt::RightEdge)
             ? loadedRows.keys() : loadedColumns.keys();
     loadRequest.begin(edge, edgeIndex, visibleCells, incubationMode);
     processLoadRequest();
@@ -2059,7 +2059,8 @@ bool QQuickTableViewPrivate::updateTableRecursive()
     if (!updateComplete)
         return false;
 
-    for (auto syncChild : qAsConst(syncChildren)) {
+    const auto children = syncChildren;
+    for (auto syncChild : children) {
         auto syncChild_d = syncChild->d_func();
         syncChild_d->scheduledRebuildOptions |= rebuildOptions;
 
@@ -2129,15 +2130,17 @@ void QQuickTableViewPrivate::fixup(QQuickFlickablePrivate::AxisData &data, qreal
     QQuickFlickablePrivate::fixup(data, minExtent, maxExtent);
 }
 
-int QQuickTableViewPrivate::resolveImportVersion()
+QTypeRevision QQuickTableViewPrivate::resolveImportVersion()
 {
     const auto data = QQmlData::get(q_func());
     if (!data || !data->propertyCache)
-        return 0;
+        return QTypeRevision::zero();
 
     const auto cppMetaObject = data->propertyCache->firstCppMetaObject();
     const auto qmlTypeView = QQmlMetaType::qmlType(cppMetaObject);
-    return qmlTypeView.minorVersion();
+
+    // TODO: did we rather want qmlTypeView.revision() here?
+    return qmlTypeView.metaObjectRevision();
 }
 
 void QQuickTableViewPrivate::createWrapperModel()