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/qquickspringanimation_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/qquickspringanimation_p.h')
| -rw-r--r-- | src/quick/util/qquickspringanimation_p.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/quick/util/qquickspringanimation_p.h b/src/quick/util/qquickspringanimation_p.h index 25b49be2a0..ba7f83fa44 100644 --- a/src/quick/util/qquickspringanimation_p.h +++ b/src/quick/util/qquickspringanimation_p.h @@ -30,12 +30,12 @@ class Q_QUICK_EXPORT QQuickSpringAnimation : public QQuickNumberAnimation Q_DECLARE_PRIVATE(QQuickSpringAnimation) Q_INTERFACES(QQmlPropertyValueSource) - Q_PROPERTY(qreal velocity READ velocity WRITE setVelocity FINAL) - Q_PROPERTY(qreal spring READ spring WRITE setSpring FINAL) - Q_PROPERTY(qreal damping READ damping WRITE setDamping FINAL) - Q_PROPERTY(qreal epsilon READ epsilon WRITE setEpsilon FINAL) - Q_PROPERTY(qreal modulus READ modulus WRITE setModulus NOTIFY modulusChanged FINAL) - Q_PROPERTY(qreal mass READ mass WRITE setMass NOTIFY massChanged FINAL) + Q_PROPERTY(qreal velocity READ velocity WRITE setVelocity) + Q_PROPERTY(qreal spring READ spring WRITE setSpring) + Q_PROPERTY(qreal damping READ damping WRITE setDamping) + Q_PROPERTY(qreal epsilon READ epsilon WRITE setEpsilon) + Q_PROPERTY(qreal modulus READ modulus WRITE setModulus NOTIFY modulusChanged) + Q_PROPERTY(qreal mass READ mass WRITE setMass NOTIFY massChanged) QML_NAMED_ELEMENT(SpringAnimation) QML_ADDED_IN_VERSION(2, 0) |