QQmlDelegateModel: guard new row/column properties with revision 12

Tag the new 'row' and 'column' properties with revision 12.
This will make sure that they cannot be accessed by the delegate
unless the QQmlAdaptorModel has the correct minorVersion set.

Fixes: QTBUG-70031
Change-Id: I49e67c37ab5b7925c7bca313bbb99f04d1387cc4
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

1 files changed, 12 insertions, 0 deletions

diff --git a/tests/auto/quick/qquicktableview/tst_qquicktableview.cpp b/tests/auto/quick/qquicktableview/tst_qquicktableview.cpp
index d475ef9c4d..22f6e5d654 100644
--- a/tests/auto/quick/qquicktableview/tst_qquicktableview.cpp
+++ b/tests/auto/quick/qquicktableview/tst_qquicktableview.cpp
@@ -156,6 +156,7 @@ private slots:
     void checkRebuildViewportOnly();
     void useDelegateChooserWithoutDefault();
     void checkTableviewInsideAsyncLoader();
+    void checkThatRevisionedPropertiesCannotBeUsedInOldImports();
 };
 
 tst_QQuickTableView::tst_QQuickTableView()
@@ -2003,6 +2004,17 @@ void tst_QQuickTableView::checkTableviewInsideAsyncLoader()
     QVERIFY(height > 0);
 };
 
+void tst_QQuickTableView::checkThatRevisionedPropertiesCannotBeUsedInOldImports()
+{
+    // Check that if you use a QQmlAdaptorModel together with a Repeater, the
+    // revisioned context properties 'row' and 'column' are not accessible.
+    LOAD_TABLEVIEW("checkmodelpropertyrevision.qml");
+    const int resolvedRow = view->rootObject()->property("resolvedDelegateRow").toInt();
+    const int resolvedColumn = view->rootObject()->property("resolvedDelegateColumn").toInt();
+    QCOMPARE(resolvedRow, 42);
+    QCOMPARE(resolvedColumn, 42);
+}
+
 QTEST_MAIN(tst_QQuickTableView)
 
 #include "tst_qquicktableview.moc"