diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-04 01:00:22 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-10-04 11:29:16 +0200 |
| commit | 9c7121df1579d38c7f4136da6146d7acae8fedcc (patch) | |
| tree | 0917e293d83b4c1ce635cf65185e6ad98fe66519 /src/quick/handlers/qquicktaphandler.cpp | |
| parent | f529d38103a6c1c5c7b76ad92e0e5641719e369e (diff) | |
| parent | c211b93bb87308601fe1c808634eb648d1949c40 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/imports/qtquick2/plugins.qmltypes
src/quick/items/qquickitemsmodule.cpp
Change-Id: I841c65c9c131354788b4f3fcfe3d7ed27be316d5
Diffstat (limited to 'src/quick/handlers/qquicktaphandler.cpp')
| -rw-r--r-- | src/quick/handlers/qquicktaphandler.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/quick/handlers/qquicktaphandler.cpp b/src/quick/handlers/qquicktaphandler.cpp index 5f9d2151d7..272ebe6b63 100644 --- a/src/quick/handlers/qquicktaphandler.cpp +++ b/src/quick/handlers/qquicktaphandler.cpp @@ -379,7 +379,7 @@ void QQuickTapHandler::updateTimeHeld() That is, if you press and release a touchpoint or button within a time period less than \l longPressThreshold, while any movement does not exceed the drag threshold, then the \c tapped signal will be emitted at the time - of release. The \c eventPoint signal parameter contains information + of release. The \a eventPoint signal parameter contains information from the release event about the point that was tapped: \snippet pointerHandlers/tapHandlerOnTapped.qml 0 @@ -392,7 +392,7 @@ void QQuickTapHandler::updateTimeHeld() This signal is emitted when the \c parent Item is tapped once. After an amount of time greater than QStyleHints::mouseDoubleClickInterval, it can be tapped again; but if the time until the next tap is less, - \l tapCount will increase. The \c eventPoint signal parameter contains + \l tapCount will increase. The \a eventPoint signal parameter contains information from the release event about the point that was tapped. */ @@ -404,13 +404,13 @@ void QQuickTapHandler::updateTimeHeld() short span of time (QStyleHints::mouseDoubleClickInterval()) and distance (QStyleHints::mouseDoubleClickDistance() or QStyleHints::touchDoubleTapDistance()). This signal always occurs after - \l singleTapped, \l tapped, and \l tapCountChanged. The \c eventPoint + \l singleTapped, \l tapped, and \l tapCountChanged. The \a eventPoint signal parameter contains information from the release event about the point that was tapped. */ /*! - \qmlsignal QtQuick::TapHandler::longPressed + \qmlsignal QtQuick::TapHandler::longPressed() This signal is emitted when the \c parent Item is pressed and held for a time period greater than \l longPressThreshold. That is, if you press and @@ -420,7 +420,7 @@ void QQuickTapHandler::updateTimeHeld() */ /*! - \qmlsignal QtQuick::TapHandler::tapCountChanged + \qmlsignal QtQuick::TapHandler::tapCountChanged() This signal is emitted when the \c parent Item is tapped once or more (within a specified time and distance span) and when the present \c tapCount differs |