diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2020-09-18 17:10:15 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-09-19 12:11:25 +0200 |
commit | 0dfdfd2300e6d96e69527e37bb77079f4cda29ed (patch) | |
tree | b97eb0553726b42f1eb1d6e2d39c7a98104d98ff /src | |
parent | b41753c356a9b0c3552d1879dd3e9952cdb11574 (diff) |
Rename PointingDeviceUniqueId QML type to lowercase
Value types should be lowercase and this one is not a QObject. It's also
undocumented. Therefore we should be able to rename it without much
drama.
Change-Id: I7ae75aca5e592c9bee2a33ec3c36ed2ffa1edecd
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/quick/handlers/qquickhandlerpoint.cpp | 2 | ||||
-rw-r--r-- | src/quick/items/qquickitemsmodule_p.h | 3 | ||||
-rw-r--r-- | src/quick/items/qquickmultipointtoucharea.cpp | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/quick/handlers/qquickhandlerpoint.cpp b/src/quick/handlers/qquickhandlerpoint.cpp index 3cd1bccbfc..58123630ac 100644 --- a/src/quick/handlers/qquickhandlerpoint.cpp +++ b/src/quick/handlers/qquickhandlerpoint.cpp @@ -201,7 +201,7 @@ void QQuickHandlerPoint::reset(const QVector<QQuickHandlerPoint> &points) /*! \readonly - \qmlproperty PointingDeviceUniqueId QtQuick::HandlerPoint::uniqueId + \qmlproperty pointingDeviceUniqueId QtQuick::HandlerPoint::uniqueId \brief The unique ID of the point, if any This is normally empty, because touchscreens cannot uniquely identify fingers. diff --git a/src/quick/items/qquickitemsmodule_p.h b/src/quick/items/qquickitemsmodule_p.h index eecd4dff72..32fadec867 100644 --- a/src/quick/items/qquickitemsmodule_p.h +++ b/src/quick/items/qquickitemsmodule_p.h @@ -86,9 +86,8 @@ struct QPointingDeviceUniqueIdForeign { Q_GADGET QML_FOREIGN(QPointingDeviceUniqueId) - QML_NAMED_ELEMENT(PointingDeviceUniqueId) + QML_VALUE_TYPE(pointingDeviceUniqueId) QML_ADDED_IN_VERSION(2, 9) - QML_UNCREATABLE("PointingDeviceUniqueId is only available via read-only properties.") }; #if !QT_CONFIG(quick_animatedimage) diff --git a/src/quick/items/qquickmultipointtoucharea.cpp b/src/quick/items/qquickmultipointtoucharea.cpp index 8b666628e3..37fc928aee 100644 --- a/src/quick/items/qquickmultipointtoucharea.cpp +++ b/src/quick/items/qquickmultipointtoucharea.cpp @@ -269,7 +269,7 @@ void QQuickTouchPoint::setSceneY(qreal sceneY) } /*! - \qmlproperty PointingDeviceUniqueId QtQuick::TouchPoint::uniqueId + \qmlproperty pointingDeviceUniqueId QtQuick::TouchPoint::uniqueId \since 5.9 This property holds the unique ID of the touch point or token. |