Merge remote-tracking branch 'origin/5.12' into 5.13

 Conflicts:
	src/qml/compiler/qv4codegen.cpp
        src/qml/animations/qsequentialanimationgroupjob.cpp

Change-Id: I8b76e509fd7c8599d4cef25181d790ee28edab54

1 files changed, 13 insertions, 6 deletions

diff --git a/src/quick/handlers/qquicktaphandler.cpp b/src/quick/handlers/qquicktaphandler.cpp
index b4b6bd574e..081645da71 100644
--- a/src/quick/handlers/qquicktaphandler.cpp
+++ b/src/quick/handlers/qquicktaphandler.cpp
@@ -230,7 +230,7 @@ void QQuickTapHandler::timerEvent(QTimerEvent *event)
            will not take the exclusive grab, but merely a passive grab.
 
     \value TapHandler.WithinBounds
-           If the event point leaves the bounds of the \l parent Item, the tap
+           If the event point leaves the bounds of the \c parent Item, the tap
            gesture is canceled. The TapHandler will take the exclusive grab on
            press, but will release the grab as soon as the boundary constraint
            is no longer satisfied.
@@ -238,7 +238,7 @@ void QQuickTapHandler::timerEvent(QTimerEvent *event)
     \value TapHandler.ReleaseWithinBounds
            At the time of release (the mouse button is released or the finger
            is lifted), if the event point is outside the bounds of the
-           \l parent Item, a tap gesture is not recognized. This corresponds to
+           \c parent Item, a tap gesture is not recognized. This corresponds to
            typical behavior for button widgets: you can cancel a click by
            dragging outside the button, and you can also change your mind by
            dragging back inside the button before release. Note that it's
@@ -383,7 +383,7 @@ void QQuickTapHandler::updateTimeHeld()
 /*!
     \qmlsignal QtQuick::TapHandler::tapped
 
-    This signal is emitted each time the \l parent Item is tapped.
+    This signal is emitted each time the \c parent Item is tapped.
 
     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
@@ -395,7 +395,7 @@ void QQuickTapHandler::updateTimeHeld()
     \qmlsignal QtQuick::TapHandler::singleTapped
     \since 5.11
 
-    This signal is emitted when the \l parent Item is tapped once.
+    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.
@@ -405,7 +405,7 @@ void QQuickTapHandler::updateTimeHeld()
     \qmlsignal QtQuick::TapHandler::doubleTapped
     \since 5.11
 
-    This signal is emitted when the \l parent Item is tapped twice within a
+    This signal is emitted when the \c parent Item is tapped twice within a
     short span of time (QStyleHints::mouseDoubleClickInterval) and distance
     (QPlatformTheme::MouseDoubleClickDistance or
     QPlatformTheme::TouchDoubleTapDistance). This signal always occurs after
@@ -415,11 +415,18 @@ void QQuickTapHandler::updateTimeHeld()
 /*!
     \qmlsignal QtQuick::TapHandler::longPressed
 
-    This signal is emitted when the \l parent Item is pressed and held for a
+    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
     hold a touchpoint or button, while any movement does not exceed the drag
     threshold, then the \c longPressed signal will be emitted at the time that
     \l timeHeld exceeds \l longPressThreshold.
 */
 
+/*!
+    \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
+    from the previous \c tapCount.
+*/
 QT_END_NAMESPACE