Add major version to all Q_REVISIONs

Change-Id: Id72fbe10c16de61bd847773d0055d83cfe03f63c
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

9 files changed, 22 insertions, 16 deletions

diff --git a/src/qmlmodels/qqmlabstractdelegatecomponent_p.h b/src/qmlmodels/qqmlabstractdelegatecomponent_p.h
index 07cae6b092..853a7e8af8 100644
--- a/src/qmlmodels/qqmlabstractdelegatecomponent_p.h
+++ b/src/qmlmodels/qqmlabstractdelegatecomponent_p.h
@@ -65,6 +65,7 @@ class Q_QMLMODELS_PRIVATE_EXPORT QQmlAbstractDelegateComponent : public QQmlComp
 {
     Q_OBJECT
     QML_NAMED_ELEMENT(AbstractDelegateComponent)
+    QML_ADDED_IN_VERSION(2, 0)
     QML_UNCREATABLE("Cannot create instance of abstract class AbstractDelegateComponent.")
 
 public:
diff --git a/src/qmlmodels/qqmldelegatemodel_p.h b/src/qmlmodels/qqmldelegatemodel_p.h
index 8aab4badca..f4578e130e 100644
--- a/src/qmlmodels/qqmldelegatemodel_p.h
+++ b/src/qmlmodels/qqmldelegatemodel_p.h
@@ -86,7 +86,7 @@ class Q_QMLMODELS_PRIVATE_EXPORT QQmlDelegateModel : public QQmlInstanceModel, p
     Q_PROPERTY(QVariant rootIndex READ rootIndex WRITE setRootIndex NOTIFY rootIndexChanged)
     Q_CLASSINFO("DefaultProperty", "delegate")
     QML_NAMED_ELEMENT(DelegateModel)
-    QML_ADDED_IN_MINOR_VERSION(1)
+    QML_ADDED_IN_VERSION(2, 1)
     QML_ATTACHED(QQmlDelegateModelAttached)
     Q_INTERFACES(QQmlParserStatus)
 
@@ -172,7 +172,7 @@ class Q_QMLMODELS_PRIVATE_EXPORT QQmlDelegateModelGroup : public QObject
     Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
     Q_PROPERTY(bool includeByDefault READ defaultInclude WRITE setDefaultInclude NOTIFY defaultIncludeChanged)
     QML_NAMED_ELEMENT(DelegateModelGroup)
-    QML_ADDED_IN_MINOR_VERSION(1)
+    QML_ADDED_IN_VERSION(2, 1)
 public:
     QQmlDelegateModelGroup(QObject *parent = nullptr);
     QQmlDelegateModelGroup(const QString &name, QQmlDelegateModel *model, int compositorType, QObject *parent = nullptr);
diff --git a/src/qmlmodels/qqmldelegatemodel_p_p.h b/src/qmlmodels/qqmldelegatemodel_p_p.h
index 40c6bcdb21..8684439508 100644
--- a/src/qmlmodels/qqmldelegatemodel_p_p.h
+++ b/src/qmlmodels/qqmldelegatemodel_p_p.h
@@ -100,8 +100,8 @@ class QQmlDelegateModelItem : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(int index READ modelIndex NOTIFY modelIndexChanged)
-    Q_PROPERTY(int row READ modelRow NOTIFY rowChanged REVISION 12)
-    Q_PROPERTY(int column READ modelColumn NOTIFY columnChanged REVISION 12)
+    Q_PROPERTY(int row READ modelRow NOTIFY rowChanged REVISION(2, 12))
+    Q_PROPERTY(int column READ modelColumn NOTIFY columnChanged REVISION(2, 12))
     Q_PROPERTY(QObject *model READ modelObject CONSTANT)
 public:
     QQmlDelegateModelItem(const QQmlRefPointer<QQmlDelegateModelItemMetaType> &metaType,
@@ -162,8 +162,8 @@ public:
 
 Q_SIGNALS:
     void modelIndexChanged();
-    Q_REVISION(12) void rowChanged();
-    Q_REVISION(12) void columnChanged();
+    Q_REVISION(2, 12) void rowChanged();
+    Q_REVISION(2, 12) void columnChanged();
 
 protected:
     void objectDestroyed(QObject *);
diff --git a/src/qmlmodels/qqmlinstantiator_p.h b/src/qmlmodels/qqmlinstantiator_p.h
index 9f6d816d18..fec5c3888a 100644
--- a/src/qmlmodels/qqmlinstantiator_p.h
+++ b/src/qmlmodels/qqmlinstantiator_p.h
@@ -73,7 +73,7 @@ class Q_QMLMODELS_PRIVATE_EXPORT QQmlInstantiator : public QObject, public QQmlP
     Q_PROPERTY(QObject *object READ object NOTIFY objectChanged)
     Q_CLASSINFO("DefaultProperty", "delegate")
     QML_NAMED_ELEMENT(Instantiator)
-    QML_ADDED_IN_MINOR_VERSION(1)
+    QML_ADDED_IN_VERSION(2, 1)
 
 public:
     QQmlInstantiator(QObject *parent = nullptr);
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
diff --git a/src/qmlmodels/qqmllistmodelworkeragent_p.h b/src/qmlmodels/qqmllistmodelworkeragent_p.h
index f65909dcec..1700ff755f 100644
--- a/src/qmlmodels/qqmllistmodelworkeragent_p.h
+++ b/src/qmlmodels/qqmllistmodelworkeragent_p.h
@@ -73,6 +73,7 @@ class QQmlListModelWorkerAgent : public QObject
     Q_PROPERTY(int count READ count)
     Q_PROPERTY(QV4::ExecutionEngine *engine READ engine WRITE setEngine NOTIFY engineChanged)
     QML_ANONYMOUS
+    QML_ADDED_IN_VERSION(2, 0)
 
 public:
     QQmlListModelWorkerAgent(QQmlListModel *);
diff --git a/src/qmlmodels/qqmlmodelsmodule_p.h b/src/qmlmodels/qqmlmodelsmodule_p.h
index e3e43f3922..70268f53f2 100644
--- a/src/qmlmodels/qqmlmodelsmodule_p.h
+++ b/src/qmlmodels/qqmlmodelsmodule_p.h
@@ -67,7 +67,7 @@ struct QItemSelectionModelForeign
     Q_GADGET
     QML_FOREIGN(QItemSelectionModel)
     QML_NAMED_ELEMENT(ItemSelectionModel)
-    QML_ADDED_IN_MINOR_VERSION(2)
+    QML_ADDED_IN_VERSION(2, 2)
 };
 #endif
 
diff --git a/src/qmlmodels/qqmlobjectmodel_p.h b/src/qmlmodels/qqmlobjectmodel_p.h
index 7fb4f64676..5b3423b480 100644
--- a/src/qmlmodels/qqmlobjectmodel_p.h
+++ b/src/qmlmodels/qqmlobjectmodel_p.h
@@ -70,6 +70,7 @@ class Q_QMLMODELS_PRIVATE_EXPORT QQmlInstanceModel : public QObject
 
     Q_PROPERTY(int count READ count NOTIFY countChanged)
     QML_ANONYMOUS
+    QML_ADDED_IN_VERSION(2, 0)
 
 public:
     enum ReusableFlag {
@@ -125,7 +126,7 @@ class Q_QMLMODELS_PRIVATE_EXPORT QQmlObjectModel : public QQmlInstanceModel
     Q_PROPERTY(QQmlListProperty<QObject> children READ children NOTIFY childrenChanged DESIGNABLE false)
     Q_CLASSINFO("DefaultProperty", "children")
     QML_NAMED_ELEMENT(ObjectModel)
-    QML_ADDED_IN_MINOR_VERSION(1)
+    QML_ADDED_IN_VERSION(2, 1)
     QML_ATTACHED(QQmlObjectModelAttached)
 
 public:
@@ -146,14 +147,14 @@ public:
 
     static QQmlObjectModelAttached *qmlAttachedProperties(QObject *obj);
 
-    Q_REVISION(3) Q_INVOKABLE QObject *get(int index) const;
-    Q_REVISION(3) Q_INVOKABLE void append(QObject *object);
-    Q_REVISION(3) Q_INVOKABLE void insert(int index, QObject *object);
-    Q_REVISION(3) Q_INVOKABLE void move(int from, int to, int n = 1);
-    Q_REVISION(3) Q_INVOKABLE void remove(int index, int n = 1);
+    Q_REVISION(2, 3) Q_INVOKABLE QObject *get(int index) const;
+    Q_REVISION(2, 3) Q_INVOKABLE void append(QObject *object);
+    Q_REVISION(2, 3) Q_INVOKABLE void insert(int index, QObject *object);
+    Q_REVISION(2, 3) Q_INVOKABLE void move(int from, int to, int n = 1);
+    Q_REVISION(2, 3) Q_INVOKABLE void remove(int index, int n = 1);
 
 public Q_SLOTS:
-    Q_REVISION(3) void clear();
+    Q_REVISION(2, 3) void clear();
 
 Q_SIGNALS:
     void childrenChanged();
diff --git a/src/qmlmodels/qquickpackage_p.h b/src/qmlmodels/qquickpackage_p.h
index 801b8d8409..f40ffe552a 100644
--- a/src/qmlmodels/qquickpackage_p.h
+++ b/src/qmlmodels/qquickpackage_p.h
@@ -67,6 +67,7 @@ class Q_AUTOTEST_EXPORT QQuickPackage : public QObject
 
     Q_CLASSINFO("DefaultProperty", "data")
     QML_NAMED_ELEMENT(Package)
+    QML_ADDED_IN_VERSION(2, 0)
     QML_ATTACHED(QQuickPackageAttached)
     Q_PROPERTY(QQmlListProperty<QObject> data READ data)