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/qquickpropertychanges_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/qquickpropertychanges_p.h')
| -rw-r--r-- | src/quick/util/qquickpropertychanges_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/util/qquickpropertychanges_p.h b/src/quick/util/qquickpropertychanges_p.h index 38d0c00721..b7413c1142 100644 --- a/src/quick/util/qquickpropertychanges_p.h +++ b/src/quick/util/qquickpropertychanges_p.h @@ -25,10 +25,10 @@ class Q_QUICK_EXPORT QQuickPropertyChanges : public QQuickStateOperation { Q_OBJECT Q_DECLARE_PRIVATE(QQuickPropertyChanges) - Q_PROPERTY(QObject *target READ object WRITE setObject NOTIFY objectChanged FINAL) + Q_PROPERTY(QObject *target READ object WRITE setObject NOTIFY objectChanged) Q_PROPERTY(bool restoreEntryValues READ restoreEntryValues WRITE setRestoreEntryValues - NOTIFY restoreEntryValuesChanged FINAL) - Q_PROPERTY(bool explicit READ isExplicit WRITE setIsExplicit NOTIFY isExplicitChanged FINAL) + NOTIFY restoreEntryValuesChanged) + Q_PROPERTY(bool explicit READ isExplicit WRITE setIsExplicit NOTIFY isExplicitChanged) QML_NAMED_ELEMENT(PropertyChanges) QML_ADDED_IN_VERSION(2, 0) QML_CUSTOMPARSER |