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

 Conflicts:
	tests/auto/quick/qquicktableview/tst_qquicktableview.cpp

Change-Id: If3bf1abc23a59c458be0bb862d92f2edcb16b79f

2 files changed, 13 insertions, 0 deletions

diff --git a/src/quick/items/qquicktableview.cpp b/src/quick/items/qquicktableview.cpp
index 28871e8068..675208d75c 100644
--- a/src/quick/items/qquicktableview.cpp
+++ b/src/quick/items/qquicktableview.cpp
@@ -1760,6 +1760,17 @@ void QQuickTableViewPrivate::fixup(QQuickFlickablePrivate::AxisData &data, qreal
     QQuickFlickablePrivate::fixup(data, minExtent, maxExtent);
 }
 
+int QQuickTableViewPrivate::resolveImportVersion()
+{
+    const auto data = QQmlData::get(q_func());
+    if (!data || !data->propertyCache)
+        return 0;
+
+    const auto cppMetaObject = data->propertyCache->firstCppMetaObject();
+    const auto qmlTypeView = QQmlMetaType::qmlType(cppMetaObject);
+    return qmlTypeView.minorVersion();
+}
+
 void QQuickTableViewPrivate::createWrapperModel()
 {
     Q_Q(QQuickTableView);
@@ -1769,6 +1780,7 @@ void QQuickTableViewPrivate::createWrapperModel()
     // common interface to any kind of model (js arrays, QAIM, number etc), and
     // help us create delegate instances.
     tableModel = new QQmlTableInstanceModel(qmlContext(q));
+    tableModel->useImportVersion(resolveImportVersion());
     model = tableModel;
 }
 
diff --git a/src/quick/items/qquicktableview_p_p.h b/src/quick/items/qquicktableview_p_p.h
index 9bea8040dc..f2fef0d774 100644
--- a/src/quick/items/qquicktableview_p_p.h
+++ b/src/quick/items/qquicktableview_p_p.h
@@ -359,6 +359,7 @@ public:
     void scheduleRebuildTable(QQuickTableViewPrivate::RebuildOptions options);
     void invalidateColumnRowPositions();
 
+    int resolveImportVersion();
     void createWrapperModel();
 
     void initItemCallback(int modelIndex, QObject *item);