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/qquickevents.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/qquickevents.cpp')
| -rw-r--r-- | src/quick/items/qquickevents.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/quick/items/qquickevents.cpp b/src/quick/items/qquickevents.cpp index 1f10afcc08..31c56b7cb7 100644 --- a/src/quick/items/qquickevents.cpp +++ b/src/quick/items/qquickevents.cpp @@ -57,7 +57,7 @@ Q_LOGGING_CATEGORY(lcPointerGrab, "qt.quick.pointer.grab") \inqmlmodule QtQuick \ingroup qtquick-input-events - \brief Provides information about a key event + \brief Provides information about a key event. For example, the following changes the Item's state property when the Enter key is pressed: @@ -182,7 +182,7 @@ Item { \inqmlmodule QtQuick \ingroup qtquick-input-events - \brief Provides information about a mouse event + \brief Provides information about a mouse event. The position of the mouse can be found via the \l {Item::x} {x} and \l {Item::y} {y} properties. The button that caused the event is available via the \l button property. @@ -349,7 +349,7 @@ Item { \instantiates QQuickWheelEvent \inqmlmodule QtQuick \ingroup qtquick-input-events - \brief Provides information about a mouse wheel event + \brief Provides information about a mouse wheel event. The position of the mouse can be found via the \l {Item::x} {x} and \l {Item::y} {y} properties. @@ -474,7 +474,7 @@ Item { \inqmlmodule QtQuick \ingroup qtquick-input-events - \brief Provides information about a pointing device + \brief Provides information about a pointing device. A pointing device can be a mouse, a touchscreen, or a stylus on a graphics tablet. @@ -673,7 +673,7 @@ QQuickPointerDevice *QQuickPointerDevice::tabletDevice(qint64 id) \instantiates QQuickEventPoint \inqmlmodule QtQuick \ingroup qtquick-input-events - \brief Provides information about an individual point within a PointerEvent + \brief Provides information about an individual point within a PointerEvent. A PointerEvent contains an EventPoint for each point of contact: one corresponding to the mouse cursor, or one for each finger touching a touchscreen. @@ -1036,7 +1036,7 @@ void QQuickEventPoint::setAccepted(bool accepted) \instantiates QQuickEventTouchPoint \inqmlmodule QtQuick \ingroup qtquick-input-events - \brief Provides information about an individual touch point within a PointerEvent + \brief Provides information about an individual touch point within a PointerEvent. \sa PointerEvent, PointerHandler */ @@ -1191,7 +1191,7 @@ QVector2D QQuickEventPoint::estimatedVelocity() const \inqmlmodule QtQuick \ingroup qtquick-input-events - \brief Provides information about an event from a pointing device + \brief Provides information about an event from a pointing device. A PointerEvent is an event describing contact or movement across a surface, provided by a mouse, a touchpoint (single finger on a touchscreen), or a |