diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2020-01-16 13:42:11 +0100 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-02-19 15:48:27 +0100 |
commit | ddde036f6a5781dc0481fae293bd387b3344171a (patch) | |
tree | bc3c348e6fecc57c1b5a85e08112bd6a33ce4868 /src/imports/layouts | |
parent | 440d699f83ab2a9676744755fd8d42c1cfeb8064 (diff) |
Add major version to all Q_REVISIONs
Change-Id: Id72fbe10c16de61bd847773d0055d83cfe03f63c
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/imports/layouts')
-rw-r--r-- | src/imports/layouts/qquicklayout_p.h | 1 | ||||
-rw-r--r-- | src/imports/layouts/qquicklinearlayout_p.h | 10 | ||||
-rw-r--r-- | src/imports/layouts/qquickstacklayout_p.h | 2 |
3 files changed, 9 insertions, 4 deletions
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); |