diff options
| author | Fabian Kosmale <[email protected]> | 2024-02-12 12:51:52 +0100 |
|---|---|---|
| committer | Fabian Kosmale <[email protected]> | 2024-02-17 22:07:23 +0100 |
| commit | bd131dcbf579f822ac8cee98324dc1355f7cd314 (patch) | |
| tree | 2976eb4f7741faf2c917a526cebcd8ec1f978c15 /src/quick/items/qquicktranslate_p.h | |
| parent | 846134c7a612bdd687f1a62ec51ecfc4d394d348 (diff) | |
Partially revert "Make properties in Qt Quick FINAL to prevent shadowing"
Making properties FINAL is an API break not covered by any QUIP rule.
However, this does not apply to the attached and uncreatable types
(either explicitly, or because they are singletons or value types) whose
properties were marked FINAL in the referenced commit, as it is not
possible to derive from them anyway. So those are left with their
properties still marked as final.
This partially reverts commit 351979e05ad2a861fc3e6f8d1de6197a751316a8.
Pick-to: 6.6 6.7
Change-Id: I1ce8c0873c4600ec2aad8e078c379239ad03f74a
Reviewed-by: Ulf Hermann <[email protected]>
Reviewed-by: Qt CI Bot <[email protected]>
Diffstat (limited to 'src/quick/items/qquicktranslate_p.h')
| -rw-r--r-- | src/quick/items/qquicktranslate_p.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/quick/items/qquicktranslate_p.h b/src/quick/items/qquicktranslate_p.h index 54feb0ab44..496a115d3f 100644 --- a/src/quick/items/qquicktranslate_p.h +++ b/src/quick/items/qquicktranslate_p.h @@ -28,8 +28,8 @@ class Q_QUICK_EXPORT QQuickTranslate : public QQuickTransform { Q_OBJECT - Q_PROPERTY(qreal x READ x WRITE setX NOTIFY xChanged FINAL) - Q_PROPERTY(qreal y READ y WRITE setY NOTIFY yChanged FINAL) + Q_PROPERTY(qreal x READ x WRITE setX NOTIFY xChanged) + Q_PROPERTY(qreal y READ y WRITE setY NOTIFY yChanged) QML_NAMED_ELEMENT(Translate) QML_ADDED_IN_VERSION(2, 0) @@ -57,10 +57,10 @@ class Q_QUICK_EXPORT QQuickScale : public QQuickTransform { Q_OBJECT - Q_PROPERTY(QVector3D origin READ origin WRITE setOrigin NOTIFY originChanged FINAL) - Q_PROPERTY(qreal xScale READ xScale WRITE setXScale NOTIFY xScaleChanged FINAL) - Q_PROPERTY(qreal yScale READ yScale WRITE setYScale NOTIFY yScaleChanged FINAL) - Q_PROPERTY(qreal zScale READ zScale WRITE setZScale NOTIFY zScaleChanged FINAL) + Q_PROPERTY(QVector3D origin READ origin WRITE setOrigin NOTIFY originChanged) + Q_PROPERTY(qreal xScale READ xScale WRITE setXScale NOTIFY xScaleChanged) + Q_PROPERTY(qreal yScale READ yScale WRITE setYScale NOTIFY yScaleChanged) + Q_PROPERTY(qreal zScale READ zScale WRITE setZScale NOTIFY zScaleChanged) QML_NAMED_ELEMENT(Scale) QML_ADDED_IN_VERSION(2, 0) public: @@ -96,9 +96,9 @@ class Q_QUICK_EXPORT QQuickRotation : public QQuickTransform { Q_OBJECT - Q_PROPERTY(QVector3D origin READ origin WRITE setOrigin NOTIFY originChanged FINAL) - Q_PROPERTY(qreal angle READ angle WRITE setAngle NOTIFY angleChanged FINAL) - Q_PROPERTY(QVector3D axis READ axis WRITE setAxis NOTIFY axisChanged FINAL) + Q_PROPERTY(QVector3D origin READ origin WRITE setOrigin NOTIFY originChanged) + Q_PROPERTY(qreal angle READ angle WRITE setAngle NOTIFY angleChanged) + Q_PROPERTY(QVector3D axis READ axis WRITE setAxis NOTIFY axisChanged) QML_NAMED_ELEMENT(Rotation) QML_ADDED_IN_VERSION(2, 0) public: @@ -130,7 +130,7 @@ class Q_QUICK_EXPORT QQuickMatrix4x4 : public QQuickTransform { Q_OBJECT - Q_PROPERTY(QMatrix4x4 matrix READ matrix WRITE setMatrix NOTIFY matrixChanged FINAL) + Q_PROPERTY(QMatrix4x4 matrix READ matrix WRITE setMatrix NOTIFY matrixChanged) QML_NAMED_ELEMENT(Matrix4x4) QML_ADDED_IN_VERSION(2, 3) public: |