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>

2 files changed, 99 insertions, 0 deletions

diff --git a/tests/auto/quick/qquicktableview/data/checkmodelpropertyrevision.qml b/tests/auto/quick/qquicktableview/data/checkmodelpropertyrevision.qml
new file mode 100644
index 0000000000..0550f20bac
--- /dev/null
+++ b/tests/auto/quick/qquicktableview/data/checkmodelpropertyrevision.qml
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtQuick module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.12
+import QtQuick.Window 2.12
+
+Item {
+    id: root
+    width: 640
+    height: 480
+
+    property alias tableView: tableView
+
+    property int row: 42
+    property int column: 42
+
+    property int resolvedDelegateRow: 0
+    property int resolvedDelegateColumn: 0
+
+    TableView {
+        id: tableView
+        // Dummy tableView, to let the auto test follow the
+        // same pattern for loading qml files as other tests.
+    }
+
+    Item {
+        width: 100
+        height: parent.height;
+        Repeater {
+            model: 1
+            delegate: Component {
+                Rectangle {
+                    color: "blue"
+                    height: 100
+                    width: 100
+                    Component.onCompleted: {
+                        // row and column should be resolved to be the ones
+                        // found in the root item, and not in the delegate
+                        // items context. The context properties are revisioned,
+                        // and require that the QQmlDelegateModel has an import
+                        // version set (which is not the case when using a
+                        // Repeater, only when using a TableView).
+                        resolvedDelegateRow = row
+                        resolvedDelegateColumn = column
+                    }
+                }
+            }
+        }
+    }
+}
+
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"