diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2024-02-12 12:51:52 +0100 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2024-02-17 22:07:23 +0100 |
| commit | bd131dcbf579f822ac8cee98324dc1355f7cd314 (patch) | |
| tree | 2976eb4f7741faf2c917a526cebcd8ec1f978c15 /src/quick/util/qquickanimator_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 <ulf.hermann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/quick/util/qquickanimator_p.h')
| -rw-r--r-- | src/quick/util/qquickanimator_p.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/quick/util/qquickanimator_p.h b/src/quick/util/qquickanimator_p.h index 15068420f4..fc864359c7 100644 --- a/src/quick/util/qquickanimator_p.h +++ b/src/quick/util/qquickanimator_p.h @@ -27,11 +27,11 @@ class Q_QUICK_EXPORT QQuickAnimator : public QQuickAbstractAnimation { Q_OBJECT Q_DECLARE_PRIVATE(QQuickAnimator) - Q_PROPERTY(QQuickItem *target READ targetItem WRITE setTargetItem NOTIFY targetItemChanged FINAL) - Q_PROPERTY(QEasingCurve easing READ easing WRITE setEasing NOTIFY easingChanged FINAL) - Q_PROPERTY(int duration READ duration WRITE setDuration NOTIFY durationChanged FINAL) - Q_PROPERTY(qreal to READ to WRITE setTo NOTIFY toChanged FINAL) - Q_PROPERTY(qreal from READ from WRITE setFrom NOTIFY fromChanged FINAL) + Q_PROPERTY(QQuickItem *target READ targetItem WRITE setTargetItem NOTIFY targetItemChanged) + Q_PROPERTY(QEasingCurve easing READ easing WRITE setEasing NOTIFY easingChanged) + Q_PROPERTY(int duration READ duration WRITE setDuration NOTIFY durationChanged) + Q_PROPERTY(qreal to READ to WRITE setTo NOTIFY toChanged) + Q_PROPERTY(qreal from READ from WRITE setFrom NOTIFY fromChanged) QML_NAMED_ELEMENT(Animator) QML_ADDED_IN_VERSION(2, 2) @@ -126,7 +126,7 @@ class Q_QUICK_EXPORT QQuickRotationAnimator : public QQuickAnimator { Q_OBJECT Q_DECLARE_PRIVATE(QQuickRotationAnimator) - Q_PROPERTY(RotationDirection direction READ direction WRITE setDirection NOTIFY directionChanged FINAL) + Q_PROPERTY(RotationDirection direction READ direction WRITE setDirection NOTIFY directionChanged) QML_NAMED_ELEMENT(RotationAnimator) QML_ADDED_IN_VERSION(2, 2) @@ -153,7 +153,7 @@ class Q_QUICK_EXPORT QQuickUniformAnimator : public QQuickAnimator { Q_OBJECT Q_DECLARE_PRIVATE(QQuickUniformAnimator) - Q_PROPERTY(QString uniform READ uniform WRITE setUniform NOTIFY uniformChanged FINAL) + Q_PROPERTY(QString uniform READ uniform WRITE setUniform NOTIFY uniformChanged) QML_NAMED_ELEMENT(UniformAnimator) QML_ADDED_IN_VERSION(2, 2) |