diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-10 15:09:37 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-12 15:03:03 +0100 |
| commit | 26c5243491f495194f04b449128dae36118e28da (patch) | |
| tree | 7fb14678a6fc9e44a10c9224d005e2cbdc6bcb63 /src/qmlmodels/qqmllistmodel_p.h | |
| parent | 1c7d264e3b2e9a2f0021786ea6967185f8282af0 (diff) | |
| parent | c24c5baeda4101b0058689adf9200b77a722c3a2 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
dependencies.yaml
src/qml/qml/qqmlengine.cpp
Change-Id: I6a73fd1064286f4a2232de85c2ce7f80452d4641
Diffstat (limited to 'src/qmlmodels/qqmllistmodel_p.h')
| -rw-r--r-- | src/qmlmodels/qqmllistmodel_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/qmlmodels/qqmllistmodel_p.h b/src/qmlmodels/qqmllistmodel_p.h index dc5063eb97..bf4279cd05 100644 --- a/src/qmlmodels/qqmllistmodel_p.h +++ b/src/qmlmodels/qqmllistmodel_p.h @@ -82,8 +82,9 @@ class Q_QMLMODELS_PRIVATE_EXPORT QQmlListModel : public QAbstractListModel Q_OBJECT Q_PROPERTY(int count READ count NOTIFY countChanged) Q_PROPERTY(bool dynamicRoles READ dynamicRoles WRITE setDynamicRoles) - Q_PROPERTY(QObject *agent READ agent CONSTANT REVISION(14)) + Q_PROPERTY(QObject *agent READ agent CONSTANT REVISION(2, 14)) QML_NAMED_ELEMENT(ListModel) + QML_ADDED_IN_VERSION(2, 0) public: QQmlListModel(QObject *parent=nullptr); @@ -174,6 +175,7 @@ class QQmlListElement : public QObject { Q_OBJECT QML_NAMED_ELEMENT(ListElement) + QML_ADDED_IN_VERSION(2, 0) }; class QQmlListModelParser : public QQmlCustomParser |