diff options
| author | Richard Moe Gustavsen <richard.gustavsen@qt.io> | 2018-10-17 14:48:59 +0200 |
|---|---|---|
| committer | Richard Moe Gustavsen <richard.gustavsen@qt.io> | 2019-02-21 10:55:13 +0000 |
| commit | 2c16e0c30c6c5ed12af52ecac2cda128487cb379 (patch) | |
| tree | 2aeb8f1bf4a140c782674329f62e1058b706684a /src/qml/types/qqmltableinstancemodel_p.h | |
| parent | 99e2356a734fa3eb55ffc2e983658d17ab4c3e9f (diff) | |
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>
Diffstat (limited to 'src/qml/types/qqmltableinstancemodel_p.h')
| -rw-r--r-- | src/qml/types/qqmltableinstancemodel_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/types/qqmltableinstancemodel_p.h b/src/qml/types/qqmltableinstancemodel_p.h index 03761af326..3dd5c4e4ce 100644 --- a/src/qml/types/qqmltableinstancemodel_p.h +++ b/src/qml/types/qqmltableinstancemodel_p.h @@ -93,6 +93,8 @@ public: QQmlTableInstanceModel(QQmlContext *qmlContext, QObject *parent = nullptr); ~QQmlTableInstanceModel() override; + void useImportVersion(int minorVersion); + int count() const override { return m_adaptorModel.count(); } int rows() const { return m_adaptorModel.rowCount(); } int columns() const { return m_adaptorModel.columnCount(); } |