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/handlers/qquickpointerhandler_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/handlers/qquickpointerhandler_p.h')
| -rw-r--r-- | src/quick/handlers/qquickpointerhandler_p.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/quick/handlers/qquickpointerhandler_p.h b/src/quick/handlers/qquickpointerhandler_p.h index eb4255bbca..e54338f677 100644 --- a/src/quick/handlers/qquickpointerhandler_p.h +++ b/src/quick/handlers/qquickpointerhandler_p.h @@ -38,15 +38,15 @@ class Q_QUICK_EXPORT QQuickPointerHandler : public QObject, public QQmlParserSta Q_OBJECT Q_INTERFACES(QQmlParserStatus) - Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged FINAL) - Q_PROPERTY(bool active READ active NOTIFY activeChanged FINAL) - Q_PROPERTY(QQuickItem * target READ target WRITE setTarget NOTIFY targetChanged FINAL) - Q_PROPERTY(QQuickItem * parent READ parentItem WRITE setParentItem NOTIFY parentChanged FINAL) - Q_PROPERTY(GrabPermissions grabPermissions READ grabPermissions WRITE setGrabPermissions NOTIFY grabPermissionChanged FINAL) - Q_PROPERTY(qreal margin READ margin WRITE setMargin NOTIFY marginChanged FINAL) - Q_PROPERTY(int dragThreshold READ dragThreshold WRITE setDragThreshold RESET resetDragThreshold NOTIFY dragThresholdChanged REVISION(2, 15) FINAL) + Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged) + Q_PROPERTY(bool active READ active NOTIFY activeChanged) + Q_PROPERTY(QQuickItem * target READ target WRITE setTarget NOTIFY targetChanged) + Q_PROPERTY(QQuickItem * parent READ parentItem WRITE setParentItem NOTIFY parentChanged) + Q_PROPERTY(GrabPermissions grabPermissions READ grabPermissions WRITE setGrabPermissions NOTIFY grabPermissionChanged) + Q_PROPERTY(qreal margin READ margin WRITE setMargin NOTIFY marginChanged) + Q_PROPERTY(int dragThreshold READ dragThreshold WRITE setDragThreshold RESET resetDragThreshold NOTIFY dragThresholdChanged REVISION(2, 15)) #if QT_CONFIG(cursor) - Q_PROPERTY(Qt::CursorShape cursorShape READ cursorShape WRITE setCursorShape RESET resetCursorShape NOTIFY cursorShapeChanged REVISION(2, 15) FINAL) + Q_PROPERTY(Qt::CursorShape cursorShape READ cursorShape WRITE setCursorShape RESET resetCursorShape NOTIFY cursorShapeChanged REVISION(2, 15)) #endif Q_CLASSINFO("ParentProperty", "parent") |