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/qquickstate_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/qquickstate_p.h')
| -rw-r--r-- | src/quick/util/qquickstate_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/util/qquickstate_p.h b/src/quick/util/qquickstate_p.h index 94d9587afc..b829248e24 100644 --- a/src/quick/util/qquickstate_p.h +++ b/src/quick/util/qquickstate_p.h @@ -120,10 +120,10 @@ class Q_QUICK_EXPORT QQuickState : public QObject { Q_OBJECT - Q_PROPERTY(QString name READ name WRITE setName FINAL) - Q_PROPERTY(bool when READ when WRITE setWhen FINAL) - Q_PROPERTY(QString extend READ extends WRITE setExtends FINAL) - Q_PROPERTY(QQmlListProperty<QQuickStateOperation> changes READ changes FINAL) + Q_PROPERTY(QString name READ name WRITE setName) + Q_PROPERTY(bool when READ when WRITE setWhen) + Q_PROPERTY(QString extend READ extends WRITE setExtends) + Q_PROPERTY(QQmlListProperty<QQuickStateOperation> changes READ changes) Q_CLASSINFO("DefaultProperty", "changes") Q_CLASSINFO("DeferredPropertyNames", "changes") QML_NAMED_ELEMENT(State) |