diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2024-02-12 12:24:00 +0100 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2024-02-16 13:41:59 +0100 |
| commit | 9558b7b093b6586e68f11afa6b2642070e57abce (patch) | |
| tree | c28650156f10c058f6e0f964cfa4e373278f917a /src/quicklayouts | |
| parent | 59aea7084c84711917ee40ab7a2c9babb01f00b6 (diff) | |
Partially revert "Make properties in Qt Quick Layouts FINAL"
Making properties FINAL is an API break not covered by any QUIP rule.
However, this does not apply to the attached types whose properties were
marked FINAL in the referenced commit, as it is not possible to derive
from them anyway. Moreover, properties only introduced with Qt 6.6 can
also stay final (given that they are revisioned).
This partially reverts commit b949315427a7da1e91462fa4fce0ad35abaea2d4.
Pick-to: 6.6 6.7
Change-Id: I45a03f15db7a34bbbe6befe24bb4d50556c20bf6
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/quicklayouts')
| -rw-r--r-- | src/quicklayouts/qquicklinearlayout_p.h | 15 | ||||
| -rw-r--r-- | src/quicklayouts/qquickstacklayout_p.h | 4 |
2 files changed, 10 insertions, 9 deletions
diff --git a/src/quicklayouts/qquicklinearlayout_p.h b/src/quicklayouts/qquicklinearlayout_p.h index 553deef23a..4899195b9f 100644 --- a/src/quicklayouts/qquicklinearlayout_p.h +++ b/src/quicklayouts/qquicklinearlayout_p.h @@ -33,7 +33,7 @@ class Q_QUICKLAYOUTS_EXPORT QQuickGridLayoutBase : public QQuickLayout Q_OBJECT Q_PROPERTY(Qt::LayoutDirection layoutDirection READ layoutDirection WRITE setLayoutDirection - NOTIFY layoutDirectionChanged REVISION(1, 1) FINAL) + NOTIFY layoutDirectionChanged REVISION(1, 1)) QML_ANONYMOUS QML_ADDED_IN_VERSION(1, 1) @@ -115,15 +115,16 @@ class Q_QUICKLAYOUTS_EXPORT QQuickGridLayout : public QQuickGridLayoutBase { Q_OBJECT - Q_PROPERTY(qreal columnSpacing READ columnSpacing WRITE setColumnSpacing NOTIFY columnSpacingChanged FINAL) - Q_PROPERTY(qreal rowSpacing READ rowSpacing WRITE setRowSpacing NOTIFY rowSpacingChanged FINAL) - Q_PROPERTY(int columns READ columns WRITE setColumns NOTIFY columnsChanged FINAL) - Q_PROPERTY(int rows READ rows WRITE setRows NOTIFY rowsChanged FINAL) - Q_PROPERTY(Flow flow READ flow WRITE setFlow NOTIFY flowChanged FINAL) + Q_PROPERTY(qreal columnSpacing READ columnSpacing WRITE setColumnSpacing NOTIFY columnSpacingChanged) + Q_PROPERTY(qreal rowSpacing READ rowSpacing WRITE setRowSpacing NOTIFY rowSpacingChanged) + Q_PROPERTY(int columns READ columns WRITE setColumns NOTIFY columnsChanged) + Q_PROPERTY(int rows READ rows WRITE setRows NOTIFY rowsChanged) + Q_PROPERTY(Flow flow READ flow WRITE setFlow NOTIFY flowChanged) Q_PROPERTY(bool uniformCellWidths READ uniformCellWidths WRITE setUniformCellWidths NOTIFY uniformCellWidthsChanged REVISION(6, 6) FINAL) Q_PROPERTY(bool uniformCellHeights READ uniformCellHeights WRITE setUniformCellHeights NOTIFY uniformCellHeightsChanged REVISION(6, 6) FINAL) + QML_NAMED_ELEMENT(GridLayout) QML_ADDED_IN_VERSION(1, 0) public: @@ -185,7 +186,7 @@ class QQuickLinearLayoutPrivate; class Q_QUICKLAYOUTS_EXPORT QQuickLinearLayout : public QQuickGridLayoutBase { Q_OBJECT - Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing NOTIFY spacingChanged FINAL) + Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing NOTIFY spacingChanged) Q_PROPERTY(bool uniformCellSizes READ uniformCellSizes WRITE setUniformCellSizes NOTIFY uniformCellSizesChanged REVISION(6, 6) FINAL) public: diff --git a/src/quicklayouts/qquickstacklayout_p.h b/src/quicklayouts/qquickstacklayout_p.h index aac0526f13..0ace1e63a3 100644 --- a/src/quicklayouts/qquickstacklayout_p.h +++ b/src/quicklayouts/qquickstacklayout_p.h @@ -26,8 +26,8 @@ class QQuickStackLayoutAttached; class Q_QUICKLAYOUTS_EXPORT QQuickStackLayout : public QQuickLayout { Q_OBJECT - Q_PROPERTY(int count READ count NOTIFY countChanged FINAL) - Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged FINAL) + 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_VERSION(1, 3) QML_ATTACHED(QQuickStackLayoutAttached) |