Add major version to all Q_REVISIONs

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

21 files changed, 47 insertions, 17 deletions

diff --git a/src/imports/folderlistmodel/qquickfolderlistmodel.h b/src/imports/folderlistmodel/qquickfolderlistmodel.h
index 5897bd2e0f..d7429efeda 100644
--- a/src/imports/folderlistmodel/qquickfolderlistmodel.h
+++ b/src/imports/folderlistmodel/qquickfolderlistmodel.h
@@ -67,19 +67,20 @@ class QQuickFolderListModel : public QAbstractListModel, public QQmlParserStatus
     Q_PROPERTY(QStringList nameFilters READ nameFilters WRITE setNameFilters)
     Q_PROPERTY(SortField sortField READ sortField WRITE setSortField)
     Q_PROPERTY(bool sortReversed READ sortReversed WRITE setSortReversed)
-    Q_PROPERTY(bool showFiles READ showFiles WRITE setShowFiles REVISION 1)
+    Q_PROPERTY(bool showFiles READ showFiles WRITE setShowFiles REVISION(2, 1))
     Q_PROPERTY(bool showDirs READ showDirs WRITE setShowDirs)
     Q_PROPERTY(bool showDirsFirst READ showDirsFirst WRITE setShowDirsFirst)
     Q_PROPERTY(bool showDotAndDotDot READ showDotAndDotDot WRITE setShowDotAndDotDot)
-    Q_PROPERTY(bool showHidden READ showHidden WRITE setShowHidden REVISION 1)
+    Q_PROPERTY(bool showHidden READ showHidden WRITE setShowHidden REVISION(2, 1))
     Q_PROPERTY(bool showOnlyReadable READ showOnlyReadable WRITE setShowOnlyReadable)
-    Q_PROPERTY(bool caseSensitive READ caseSensitive WRITE setCaseSensitive REVISION 2)
+    Q_PROPERTY(bool caseSensitive READ caseSensitive WRITE setCaseSensitive REVISION(2, 2))
     Q_PROPERTY(int count READ count NOTIFY countChanged)
-    Q_PROPERTY(Status status READ status NOTIFY statusChanged REVISION 11)
-    Q_PROPERTY(bool sortCaseSensitive READ sortCaseSensitive WRITE setSortCaseSensitive REVISION 12)
+    Q_PROPERTY(Status status READ status NOTIFY statusChanged REVISION(2, 11))
+    Q_PROPERTY(bool sortCaseSensitive READ sortCaseSensitive WRITE setSortCaseSensitive REVISION(2, 12))
 //![class props]
 
     QML_NAMED_ELEMENT(FolderListModel)
+    QML_ADDED_IN_VERSION(2, 0)
 //![abslistmodel]
 public:
     QQuickFolderListModel(QObject *parent = nullptr);
@@ -163,8 +164,8 @@ public:
 Q_SIGNALS:
     void folderChanged();
     void rowCountChanged() const;
-    Q_REVISION(1) void countChanged() const;
-    Q_REVISION(11) void statusChanged();
+    Q_REVISION(2, 1) void countChanged() const;
+    Q_REVISION(2, 11) void statusChanged();
 //![notifier]
 
 //![class end]
diff --git a/src/imports/labsanimation/qquickboundaryrule_p.h b/src/imports/labsanimation/qquickboundaryrule_p.h
index 1681558304..33cf0bb094 100644
--- a/src/imports/labsanimation/qquickboundaryrule_p.h
+++ b/src/imports/labsanimation/qquickboundaryrule_p.h
@@ -78,6 +78,7 @@ class QQuickBoundaryRule : public QObject, public QQmlPropertyValueInterceptor
     Q_PROPERTY(QEasingCurve easing READ easing WRITE setEasing NOTIFY easingChanged)
     Q_PROPERTY(int returnDuration READ returnDuration WRITE setReturnDuration NOTIFY returnDurationChanged)
     QML_NAMED_ELEMENT(BoundaryRule)
+    QML_ADDED_IN_VERSION(1, 0)
 
 public:
     enum OvershootFilter {
diff --git a/src/imports/labsmodels/qqmldelegatecomponent_p.h b/src/imports/labsmodels/qqmldelegatecomponent_p.h
index 8473831b1d..6f3170e19a 100644
--- a/src/imports/labsmodels/qqmldelegatecomponent_p.h
+++ b/src/imports/labsmodels/qqmldelegatecomponent_p.h
@@ -69,6 +69,8 @@ class QQmlDelegateChoice : public QObject
     Q_PROPERTY(QQmlComponent* delegate READ delegate WRITE setDelegate NOTIFY delegateChanged)
     Q_CLASSINFO("DefaultProperty", "delegate")
     QML_NAMED_ELEMENT(DelegateChoice)
+    QML_ADDED_IN_VERSION(1, 0)
+
 public:
     QVariant roleValue() const;
     void setRoleValue(const QVariant &roleValue);
diff --git a/src/imports/labsmodels/qqmltablemodel_p.h b/src/imports/labsmodels/qqmltablemodel_p.h
index 75e2768849..ae46cbe35c 100644
--- a/src/imports/labsmodels/qqmltablemodel_p.h
+++ b/src/imports/labsmodels/qqmltablemodel_p.h
@@ -74,6 +74,7 @@ class QQmlTableModel : public QAbstractTableModel, public QQmlParserStatus
     Q_INTERFACES(QQmlParserStatus)
     Q_CLASSINFO("DefaultProperty", "columns")
     QML_NAMED_ELEMENT(TableModel)
+    QML_ADDED_IN_VERSION(1, 0)
 
 public:
     QQmlTableModel(QObject *parent = nullptr);
diff --git a/src/imports/labsmodels/qqmltablemodelcolumn_p.h b/src/imports/labsmodels/qqmltablemodelcolumn_p.h
index a18f21ab4f..2860a915cc 100644
--- a/src/imports/labsmodels/qqmltablemodelcolumn_p.h
+++ b/src/imports/labsmodels/qqmltablemodelcolumn_p.h
@@ -97,6 +97,7 @@ class QQmlTableModelColumn : public QObject
     Q_PROPERTY(QJSValue sizeHint READ sizeHint WRITE setSizeHint NOTIFY sizeHintChanged FINAL)
     Q_PROPERTY(QJSValue setSizeHint READ getSetSizeHint WRITE setSetSizeHint NOTIFY setSizeHintChanged FINAL)
     QML_NAMED_ELEMENT(TableModelColumn)
+    QML_ADDED_IN_VERSION(1, 0)
 
 public:
     QQmlTableModelColumn(QObject *parent = nullptr);
diff --git a/src/imports/layouts/qquicklayout_p.h b/src/imports/layouts/qquicklayout_p.h
index 3322d03636..a2594f4274 100644
--- a/src/imports/layouts/qquicklayout_p.h
+++ b/src/imports/layouts/qquicklayout_p.h
@@ -62,6 +62,7 @@ class QQuickLayout : public QQuickItem, public QQuickItemChangeListener
 {
     Q_OBJECT
     QML_NAMED_ELEMENT(Layout)
+    QML_ADDED_IN_VERSION(1, 0)
     QML_UNCREATABLE("Do not create objects of type Layout.")
     QML_ATTACHED(QQuickLayoutAttached)
 
diff --git a/src/imports/layouts/qquicklinearlayout_p.h b/src/imports/layouts/qquicklinearlayout_p.h
index f36f99741d..1780ba8807 100644
--- a/src/imports/layouts/qquicklinearlayout_p.h
+++ b/src/imports/layouts/qquicklinearlayout_p.h
@@ -56,9 +56,10 @@ class QQuickGridLayoutBase : public QQuickLayout
 {
     Q_OBJECT
 
-    Q_PROPERTY(Qt::LayoutDirection layoutDirection READ layoutDirection WRITE setLayoutDirection NOTIFY layoutDirectionChanged REVISION 1)
+    Q_PROPERTY(Qt::LayoutDirection layoutDirection READ layoutDirection WRITE setLayoutDirection
+               NOTIFY layoutDirectionChanged REVISION(1, 1))
     QML_ANONYMOUS
-    QML_ADDED_IN_MINOR_VERSION(1)
+    QML_ADDED_IN_VERSION(1, 1)
 
 public:
 
@@ -92,7 +93,7 @@ protected:
     virtual void insertLayoutItems() {}
 
 signals:
-    Q_REVISION(1) void layoutDirectionChanged();
+    Q_REVISION(1, 1) void layoutDirectionChanged();
 
 private:
     void removeGridItem(QGridLayoutItem *gridItem);
@@ -145,6 +146,7 @@ class QQuickGridLayout : public QQuickGridLayoutBase
     Q_PROPERTY(int rows READ rows WRITE setRows NOTIFY rowsChanged)
     Q_PROPERTY(Flow flow READ flow WRITE setFlow NOTIFY flowChanged)
     QML_NAMED_ELEMENT(GridLayout)
+    QML_ADDED_IN_VERSION(1, 0)
 public:
     explicit QQuickGridLayout(QQuickItem *parent = 0);
     qreal columnSpacing() const;
@@ -229,6 +231,7 @@ class QQuickRowLayout : public QQuickLinearLayout
 {
     Q_OBJECT
     QML_NAMED_ELEMENT(RowLayout)
+    QML_ADDED_IN_VERSION(1, 0)
 
 public:
     explicit QQuickRowLayout(QQuickItem *parent = 0)
@@ -245,6 +248,7 @@ class QQuickColumnLayout : public QQuickLinearLayout
 {
     Q_OBJECT
     QML_NAMED_ELEMENT(ColumnLayout)
+    QML_ADDED_IN_VERSION(1, 0)
 
 public:
     explicit QQuickColumnLayout(QQuickItem *parent = 0)
diff --git a/src/imports/layouts/qquickstacklayout_p.h b/src/imports/layouts/qquickstacklayout_p.h
index 537d54900f..07f9e48178 100644
--- a/src/imports/layouts/qquickstacklayout_p.h
+++ b/src/imports/layouts/qquickstacklayout_p.h
@@ -52,7 +52,7 @@ class QQuickStackLayout : public QQuickLayout
     Q_PROPERTY(int count READ count NOTIFY countChanged)
     Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged)
     QML_NAMED_ELEMENT(StackLayout)
-    QML_ADDED_IN_MINOR_VERSION(3)
+    QML_ADDED_IN_VERSION(1, 3)
 
 public:
     explicit QQuickStackLayout(QQuickItem *parent = 0);
diff --git a/src/imports/localstorage/qquicklocalstorage_p.h b/src/imports/localstorage/qquicklocalstorage_p.h
index d2ebc85ce9..f90d6bad28 100644
--- a/src/imports/localstorage/qquicklocalstorage_p.h
+++ b/src/imports/localstorage/qquicklocalstorage_p.h
@@ -61,6 +61,7 @@ class QQuickLocalStorage : public QObject
 {
     Q_OBJECT
     QML_NAMED_ELEMENT(LocalStorage)
+    QML_ADDED_IN_VERSION(2, 0)
     QML_SINGLETON
 
 public:
diff --git a/src/imports/settings/qqmlsettings_p.h b/src/imports/settings/qqmlsettings_p.h
index 3f1b83f541..100d0136ff 100644
--- a/src/imports/settings/qqmlsettings_p.h
+++ b/src/imports/settings/qqmlsettings_p.h
@@ -67,6 +67,7 @@ class QQmlSettings : public QObject, public QQmlParserStatus
     Q_PROPERTY(QString category READ category WRITE setCategory FINAL)
     Q_PROPERTY(QString fileName READ fileName WRITE setFileName FINAL)
     QML_NAMED_ELEMENT(Settings)
+    QML_ADDED_IN_VERSION(1, 0)
 
 public:
     explicit QQmlSettings(QObject *parent = 0);
diff --git a/src/imports/statemachine/finalstate.h b/src/imports/statemachine/finalstate.h
index 117a358e53..fef0e9c092 100644
--- a/src/imports/statemachine/finalstate.h
+++ b/src/imports/statemachine/finalstate.h
@@ -56,6 +56,7 @@ class FinalState : public QFinalState
     Q_PROPERTY(QQmlListProperty<QObject> children READ children NOTIFY childrenChanged)
     Q_CLASSINFO("DefaultProperty", "children")
     QML_ELEMENT
+    QML_ADDED_IN_VERSION(1, 0)
 
 public:
     explicit FinalState(QState *parent = 0);
diff --git a/src/imports/statemachine/signaltransition.h b/src/imports/statemachine/signaltransition.h
index 748e230b3e..4d73368eb0 100644
--- a/src/imports/statemachine/signaltransition.h
+++ b/src/imports/statemachine/signaltransition.h
@@ -58,6 +58,7 @@ class SignalTransition : public QSignalTransition, public QQmlParserStatus
     Q_PROPERTY(QJSValue signal READ signal WRITE setSignal NOTIFY qmlSignalChanged)
     Q_PROPERTY(QQmlScriptString guard READ guard WRITE setGuard NOTIFY guardChanged)
     QML_ELEMENT
+    QML_ADDED_IN_VERSION(1, 0)
 
 public:
     explicit SignalTransition(QState *parent = nullptr);
diff --git a/src/imports/statemachine/state.h b/src/imports/statemachine/state.h
index 68184775ab..8cb454f3cf 100644
--- a/src/imports/statemachine/state.h
+++ b/src/imports/statemachine/state.h
@@ -56,6 +56,7 @@ class State : public QState, public QQmlParserStatus
     Q_PROPERTY(QQmlListProperty<QObject> children READ children NOTIFY childrenChanged)
     Q_CLASSINFO("DefaultProperty", "children")
     QML_ELEMENT
+    QML_ADDED_IN_VERSION(1, 0)
 
 public:
     explicit State(QState *parent = 0);
diff --git a/src/imports/statemachine/statemachine.h b/src/imports/statemachine/statemachine.h
index cc0360db54..85ac4cf26b 100644
--- a/src/imports/statemachine/statemachine.h
+++ b/src/imports/statemachine/statemachine.h
@@ -60,6 +60,7 @@ class StateMachine : public QStateMachine, public QQmlParserStatus
 
     Q_CLASSINFO("DefaultProperty", "children")
     QML_ELEMENT
+    QML_ADDED_IN_VERSION(1, 0)
 
 public:
     explicit StateMachine(QObject *parent = 0);
diff --git a/src/imports/statemachine/statemachineforeign.h b/src/imports/statemachine/statemachineforeign.h
index 363c9d0e31..7543d55fdf 100644
--- a/src/imports/statemachine/statemachineforeign.h
+++ b/src/imports/statemachine/statemachineforeign.h
@@ -51,6 +51,7 @@ struct QHistoryStateForeign
     Q_GADGET
     QML_FOREIGN(QHistoryState)
     QML_NAMED_ELEMENT(HistoryState)
+    QML_ADDED_IN_VERSION(1, 0)
 };
 
 struct QStateForeign
@@ -58,6 +59,7 @@ struct QStateForeign
     Q_GADGET
     QML_FOREIGN(QState)
     QML_NAMED_ELEMENT(QState)
+    QML_ADDED_IN_VERSION(1, 0)
     QML_UNCREATABLE("Don't use this, use State instead.")
 };
 
@@ -66,6 +68,7 @@ struct QAbstractStateForeign
     Q_GADGET
     QML_FOREIGN(QAbstractState)
     QML_NAMED_ELEMENT(QAbstractState)
+    QML_ADDED_IN_VERSION(1, 0)
     QML_UNCREATABLE("Don't use this, use State instead.")
 };
 
@@ -74,6 +77,7 @@ struct QSignalTransitionForeign
     Q_GADGET
     QML_FOREIGN(QSignalTransition)
     QML_NAMED_ELEMENT(QSignalTransition)
+    QML_ADDED_IN_VERSION(1, 0)
     QML_UNCREATABLE("Don't use this, use SignalTransition instead.")
 };
 
diff --git a/src/imports/statemachine/timeouttransition.h b/src/imports/statemachine/timeouttransition.h
index cc3a22e0e5..3d056b5e41 100644
--- a/src/imports/statemachine/timeouttransition.h
+++ b/src/imports/statemachine/timeouttransition.h
@@ -53,6 +53,7 @@ class TimeoutTransition : public QSignalTransition, public QQmlParserStatus
     Q_PROPERTY(int timeout READ timeout WRITE setTimeout NOTIFY timeoutChanged)
     Q_INTERFACES(QQmlParserStatus)
     QML_ELEMENT
+    QML_ADDED_IN_VERSION(1, 0)
 
 public:
     TimeoutTransition(QState *parent = nullptr);
diff --git a/src/imports/testlib/quicktestevent_p.h b/src/imports/testlib/quicktestevent_p.h
index f452e4ff82..0bbae8434f 100644
--- a/src/imports/testlib/quicktestevent_p.h
+++ b/src/imports/testlib/quicktestevent_p.h
@@ -63,6 +63,7 @@ class QQuickTouchEventSequence : public QObject
 {
     Q_OBJECT
     QML_ANONYMOUS
+    QML_ADDED_IN_VERSION(1, 0)
 
 public:
     explicit QQuickTouchEventSequence(QuickTestEvent *testEvent, QObject *item = nullptr);
@@ -83,6 +84,7 @@ class QuickTestEvent : public QObject
     Q_OBJECT
     Q_PROPERTY(int defaultMouseDelay READ defaultMouseDelay FINAL)
     QML_NAMED_ELEMENT(TestEvent)
+    QML_ADDED_IN_VERSION(1, 0)
 public:
     QuickTestEvent(QObject *parent = nullptr);
     ~QuickTestEvent() override;
@@ -97,7 +99,7 @@ public Q_SLOTS:
     bool keyReleaseChar(const QString &character, int modifiers, int delay);
     bool keyClickChar(const QString &character, int modifiers, int delay);
 
-    Q_REVISION(2) bool keySequence(const QVariant &keySequence);
+    Q_REVISION(1, 2) bool keySequence(const QVariant &keySequence);
 
     bool mousePress(QObject *item, qreal x, qreal y, int button,
                     int modifiers, int delay);
diff --git a/src/imports/testlib/quicktestresultforeign_p.h b/src/imports/testlib/quicktestresultforeign_p.h
index 92ff8e8a5a..e9dd12fa93 100644
--- a/src/imports/testlib/quicktestresultforeign_p.h
+++ b/src/imports/testlib/quicktestresultforeign_p.h
@@ -61,6 +61,7 @@ struct QuickTestResultForeign
     Q_GADGET
     QML_FOREIGN(QuickTestResult)
     QML_NAMED_ELEMENT(TestResult)
+    QML_ADDED_IN_VERSION(1, 0)
 };
 
 QT_END_NAMESPACE
diff --git a/src/imports/testlib/quicktestutil_p.h b/src/imports/testlib/quicktestutil_p.h
index 2456bf88a7..7e90c1cd1d 100644
--- a/src/imports/testlib/quicktestutil_p.h
+++ b/src/imports/testlib/quicktestutil_p.h
@@ -63,6 +63,7 @@ class QuickTestUtil : public QObject
     Q_PROPERTY(bool printAvailableFunctions READ printAvailableFunctions NOTIFY printAvailableFunctionsChanged)
     Q_PROPERTY(int dragThreshold READ dragThreshold NOTIFY dragThresholdChanged)
     QML_NAMED_ELEMENT(TestUtil)
+    QML_ADDED_IN_VERSION(1, 0)
 public:
     QuickTestUtil(QObject *parent = nullptr) :QObject(parent) {}
     ~QuickTestUtil() override {}
diff --git a/src/imports/wavefrontmesh/qwavefrontmesh.h b/src/imports/wavefrontmesh/qwavefrontmesh.h
index a8a40c1a6a..67e0527e5d 100644
--- a/src/imports/wavefrontmesh/qwavefrontmesh.h
+++ b/src/imports/wavefrontmesh/qwavefrontmesh.h
@@ -56,6 +56,7 @@ class QWavefrontMesh : public QQuickShaderEffectMesh
     Q_PROPERTY(QVector3D projectionPlaneV READ projectionPlaneV WRITE setProjectionPlaneV NOTIFY projectionPlaneVChanged)
     Q_PROPERTY(QVector3D projectionPlaneW READ projectionPlaneW WRITE setProjectionPlaneW NOTIFY projectionPlaneWChanged)
     QML_NAMED_ELEMENT(WavefrontMesh)
+    QML_ADDED_IN_VERSION(1, 0)
 
 public:
     enum Error {
diff --git a/src/imports/window/plugin.h b/src/imports/window/plugin.h
index 9f58ca9ac7..5497030bb0 100644
--- a/src/imports/window/plugin.h
+++ b/src/imports/window/plugin.h
@@ -65,7 +65,7 @@ struct QWindowForeign
     Q_GADGET
     QML_FOREIGN(QWindow)
     QML_ANONYMOUS
-    QML_ADDED_IN_MINOR_VERSION(1)
+    QML_ADDED_IN_VERSION(2, 1)
 };
 
 struct QQuickWindowForeign
@@ -73,8 +73,8 @@ struct QQuickWindowForeign
     Q_GADGET
     QML_FOREIGN(QQuickWindow)
     QML_NAMED_ELEMENT(Window)
-    QML_ADDED_IN_MINOR_VERSION(0)
-    QML_REMOVED_IN_MINOR_VERSION(1)
+    QML_ADDED_IN_VERSION(2, 0)
+    QML_REMOVED_IN_VERSION(2, 1)
 };
 
 struct QQuickWindowForeignAttached
@@ -82,6 +82,7 @@ struct QQuickWindowForeignAttached
     Q_GADGET
     QML_FOREIGN(QQuickWindowAttached)
     QML_ANONYMOUS
+    QML_ADDED_IN_VERSION(2, 0)
 };
 
 struct QQuickScreenInfoForeign
@@ -89,7 +90,7 @@ struct QQuickScreenInfoForeign
     Q_GADGET
     QML_FOREIGN(QQuickScreenInfo)
     QML_NAMED_ELEMENT(ScreenInfo)
-    QML_ADDED_IN_MINOR_VERSION(3)
+    QML_ADDED_IN_VERSION(2, 3)
     QML_UNCREATABLE("ScreenInfo can only be used via the attached property.")
 };
 
@@ -98,6 +99,7 @@ struct QQuickScreenForeignAttached
     Q_GADGET
     QML_FOREIGN(QQuickScreenAttached)
     QML_ANONYMOUS
+    QML_ADDED_IN_VERSION(2, 0)
 };
 
 struct QQuickScreenForeign
@@ -105,6 +107,7 @@ struct QQuickScreenForeign
     Q_GADGET
     QML_FOREIGN(QQuickScreen)
     QML_NAMED_ELEMENT(Screen)
+    QML_ADDED_IN_VERSION(2, 0)
     QML_UNCREATABLE("Screen can only be used via the attached property.")
 };
 
@@ -113,7 +116,7 @@ struct QQuickWindowQmlImplForeign
     Q_GADGET
     QML_FOREIGN(QQuickWindowQmlImpl)
     QML_NAMED_ELEMENT(Window)
-    QML_ADDED_IN_MINOR_VERSION(1)
+    QML_ADDED_IN_VERSION(2, 1)
 };
 
 QT_END_NAMESPACE