diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2018-06-25 09:53:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-06-25 12:15:55 +0200 |
| commit | fbf6f7400a5b5ae10267171e201391ce1ff8eb96 (patch) | |
| tree | 18e22092c2764fea16442fd814f230d4fe095a49 /src/quick/items/qquickmultipointtoucharea.cpp | |
| parent | c21a6a9f2c2d635aca3bf88a6431c560b16b1cc6 (diff) | |
| parent | 9999591e69a0908cd3fbe14646fb98881e32061b (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/plugins/qmltooling/packetprotocol/qpacketprotocol.cpp
src/quick/handlers/qquickhandlerpoint.cpp
src/quick/handlers/qquicksinglepointhandler.cpp
tests/auto/qml/ecmascripttests/test262
Change-Id: I8908ec8c6116ca626fbd269af7625d4c429429ca
Diffstat (limited to 'src/quick/items/qquickmultipointtoucharea.cpp')
| -rw-r--r-- | src/quick/items/qquickmultipointtoucharea.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/items/qquickmultipointtoucharea.cpp b/src/quick/items/qquickmultipointtoucharea.cpp index dc168073e4..b1438d7541 100644 --- a/src/quick/items/qquickmultipointtoucharea.cpp +++ b/src/quick/items/qquickmultipointtoucharea.cpp @@ -56,7 +56,7 @@ DEFINE_BOOL_CONFIG_OPTION(qmlVisualTouchDebugging, QML_VISUAL_TOUCH_DEBUGGING) \instantiates QQuickTouchPoint \inqmlmodule QtQuick \ingroup qtquick-input-events - \brief Describes a touch point in a MultiPointTouchArea + \brief Describes a touch point in a MultiPointTouchArea. The TouchPoint type contains information about a touch point, such as the current position, pressure, and area. @@ -291,7 +291,7 @@ void QQuickTouchPoint::setUniqueId(const QPointingDeviceUniqueId &id) \instantiates QQuickGrabGestureEvent \inqmlmodule QtQuick \ingroup qtquick-input-events - \brief The parameter given with the gestureStarted signal + \brief The parameter given with the gestureStarted signal. The GestureEvent object has the current touch points, which you may choose to interpret as a gesture, and an invokable method to grab the involved @@ -328,7 +328,7 @@ void QQuickTouchPoint::setUniqueId(const QPointingDeviceUniqueId &id) \inqmlmodule QtQuick \inherits Item \ingroup qtquick-input - \brief Enables handling of multiple touch points + \brief Enables handling of multiple touch points. A MultiPointTouchArea is an invisible item that is used to track multiple touch points. |