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/items/qquickdroparea_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/items/qquickdroparea_p.h')
| -rw-r--r-- | src/quick/items/qquickdroparea_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/items/qquickdroparea_p.h b/src/quick/items/qquickdroparea_p.h index 846a4f4666..e9fff0afa0 100644 --- a/src/quick/items/qquickdroparea_p.h +++ b/src/quick/items/qquickdroparea_p.h @@ -120,9 +120,9 @@ class QQuickDropAreaPrivate; class Q_QUICK_EXPORT QQuickDropArea : public QQuickItem { Q_OBJECT - Q_PROPERTY(bool containsDrag READ containsDrag NOTIFY containsDragChanged FINAL) - Q_PROPERTY(QStringList keys READ keys WRITE setKeys NOTIFY keysChanged FINAL) - Q_PROPERTY(QQuickDropAreaDrag *drag READ drag CONSTANT FINAL) + Q_PROPERTY(bool containsDrag READ containsDrag NOTIFY containsDragChanged) + Q_PROPERTY(QStringList keys READ keys WRITE setKeys NOTIFY keysChanged) + Q_PROPERTY(QQuickDropAreaDrag *drag READ drag CONSTANT) QML_NAMED_ELEMENT(DropArea) QML_ADDED_IN_VERSION(2, 0) |