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

 Conflicts:
	src/qml/jsruntime/qv4engine.cpp
	src/quick/handlers/qquicktaphandler.cpp
	src/quick/items/qquicktableview.cpp

Done-With: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Done-With: Ulf Hermann <ulf.hermann@qt.io>
Done-With: Shawn Rutledge <shawn.rutledge@qt.io>
Change-Id: If9558a33f01693ce96420c094e0b57dfff0626cd

15 files changed, 218 insertions, 139 deletions

diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp
index ac4e86d8da..b8e6d58af4 100644
--- a/src/quick/items/context2d/qquickcanvasitem.cpp
+++ b/src/quick/items/context2d/qquickcanvasitem.cpp
@@ -848,13 +848,15 @@ QSGTextureProvider *QQuickCanvasItem::textureProvider() const
     The \a contextId parameter names the required context. The Canvas item
     will return a context that implements the required drawing mode. After the
     first call to getContext, any subsequent call to getContext with the same
-    contextId will return the same context object.
+    contextId will return the same context object. Any additional arguments
+    (\a args) are currently ignored.
 
     If the context type is not supported or the canvas has previously been
     requested to provide a different and incompatible context type, \c null
     will be returned.
 
     Canvas only supports a 2d context.
+
 */
 
 void QQuickCanvasItem::getContext(QQmlV4Function *args)
@@ -897,7 +899,7 @@ void QQuickCanvasItem::getContext(QQmlV4Function *args)
 /*!
     \qmlmethod int QtQuick::Canvas::requestAnimationFrame(callback)
 
-    This function schedules callback to be invoked before composing the Qt Quick
+    This function schedules \a callback to be invoked before composing the Qt Quick
     scene.
 */
 
@@ -960,7 +962,7 @@ void QQuickCanvasItem::requestPaint()
 /*!
     \qmlmethod QtQuick::Canvas::markDirty(rect area)
 
-    Mark the given \a area as dirty, so that when this area is visible the
+    Marks the given \a area as dirty, so that when this area is visible the
     canvas renderer will redraw it. This will trigger the \c paint signal.
 
     \sa paint, requestPaint()
@@ -984,16 +986,16 @@ void QQuickCanvasItem::checkAnimationCallbacks()
 }
 
 /*!
-  \qmlmethod bool QtQuick::Canvas::save(string filename)
+    \qmlmethod bool QtQuick::Canvas::save(string filename)
 
-   Save the current canvas content into an image file \a filename.
-   The saved image format is automatically decided by the \a filename's
-   suffix.
+    Saves the current canvas content into an image file \a filename.
+    The saved image format is automatically decided by the \a filename's
+    suffix. Returns \c true on success.
 
-   Note: calling this method will force painting the whole canvas, not just the
-   current canvas visible window.
+    \note Calling this method will force painting the whole canvas, not just the
+    current canvas visible window.
 
-   \sa canvasWindow, canvasSize, toDataURL()
+    \sa canvasWindow, canvasSize, toDataURL()
 */
 bool QQuickCanvasItem::save(const QString &filename) const
 {
@@ -1023,15 +1025,17 @@ QQmlRefPointer<QQuickCanvasPixmap> QQuickCanvasItem::loadedPixmap(const QUrl& ur
 */
 
 /*!
-  \qmlmethod QtQuick::Canvas::loadImage(url image)
-    Loads the given \c image asynchronously.
+    \qmlmethod QtQuick::Canvas::loadImage(url image)
+
+    Loads the given \a image asynchronously.
 
-    When the image is ready, \l imageLoaded will be emitted.
-    The loaded image can be unloaded by the unloadImage() method.
+    Once the image is ready, imageLoaded() signal will be emitted.
+    The loaded image can be unloaded with the unloadImage() method.
 
-    Note: Only loaded images can be painted on the Canvas item.
-  \sa unloadImage, imageLoaded, isImageLoaded(),
-      Context2D::createImageData(), Context2D::drawImage()
+    \note Only loaded images can be painted on the Canvas item.
+
+    \sa unloadImage(), imageLoaded(), isImageLoaded(),
+        Context2D::createImageData(), Context2D::drawImage()
 */
 void QQuickCanvasItem::loadImage(const QUrl& url)
 {
@@ -1051,14 +1055,15 @@ void QQuickCanvasItem::loadImage(const QUrl& url)
     }
 }
 /*!
-  \qmlmethod QtQuick::Canvas::unloadImage(url image)
-  Unloads the \c image.
+    \qmlmethod QtQuick::Canvas::unloadImage(url image)
+
+    Unloads the \a image.
 
-  Once an image is unloaded it cannot be painted by the canvas context
-  unless it is loaded again.
+    Once an image is unloaded, it cannot be painted by the canvas context
+    unless it is loaded again.
 
-  \sa loadImage(), imageLoaded, isImageLoaded(),
-      Context2D::createImageData(), Context2D::drawImage
+    \sa loadImage(), imageLoaded(), isImageLoaded(),
+        Context2D::createImageData(), Context2D::drawImage
 */
 void QQuickCanvasItem::unloadImage(const QUrl& url)
 {
@@ -1067,10 +1072,11 @@ void QQuickCanvasItem::unloadImage(const QUrl& url)
 }
 
 /*!
-  \qmlmethod QtQuick::Canvas::isImageError(url image)
-  Returns true if the \a image failed to load.
+    \qmlmethod QtQuick::Canvas::isImageError(url image)
 
-  \sa loadImage()
+    Returns \c true if the \a image failed to load, \c false otherwise.
+
+    \sa loadImage()
 */
 bool QQuickCanvasItem::isImageError(const QUrl& url) const
 {
diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp
index 48e5a4d4a2..54cda72a36 100644
--- a/src/quick/items/context2d/qquickcontext2d.cpp
+++ b/src/quick/items/context2d/qquickcontext2d.cpp
@@ -1148,6 +1148,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_scale(const QV4::FunctionO
 
 /*!
     \qmlmethod object QtQuick::Context2D::setTransform(real a, real b, real c, real d, real e, real f)
+
     Changes the transformation matrix to the matrix given by the arguments as described below.
 
     Modifying the transformation matrix directly enables you to perform scaling,
@@ -1160,21 +1161,22 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_scale(const QV4::FunctionO
     \image qml-item-canvas-math.png
     where:
     \list
-    \li \c{a} is the scale factor in the horizontal (x) direction
+    \li \a{a} is the scale factor in the horizontal (x) direction
     \image qml-item-canvas-scalex.png
-    \li \c{c} is the skew factor in the x direction
+    \li \a{c} is the skew factor in the x direction
     \image qml-item-canvas-skewx.png
-    \li \c{e} is the translation in the x direction
+    \li \a{e} is the translation in the x direction
     \image qml-item-canvas-translate.png
-    \li \c{b} is the skew factor in the y (vertical) direction
+    \li \a{b} is the skew factor in the y (vertical) direction
     \image qml-item-canvas-skewy.png
-    \li \c{d} is the scale factor in the y direction
+    \li \a{d} is the scale factor in the y direction
     \image qml-item-canvas-scaley.png
-    \li \c{f} is the translation in the y direction
+    \li \a{f} is the translation in the y direction
     \image qml-item-canvas-translatey.png
     \li the last row remains constant
     \endlist
-    The scale factors and skew factors are multiples; \c{e} and \c{f} are
+
+    The scale factors and skew factors are multiples; \a{e} and \a{f} are
     coordinate space units, just like the units in the translate(x,y)
     method.
 
@@ -1202,11 +1204,14 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_setTransform(const QV4::Fu
 /*!
     \qmlmethod object QtQuick::Context2D::transform(real a, real b, real c, real d, real e, real f)
 
-    This method is very similar to setTransform(), but instead of replacing the old
-    transform matrix, this method applies the given tranform matrix to the current matrix by multiplying to it.
+    This method is very similar to setTransform(), but instead of replacing
+    the old transform matrix, this method applies the given tranform matrix
+    to the current matrix by multiplying to it.
 
-    The setTransform(a, b, c, d, e, f) method actually resets the current transform to the identity matrix,
-    and then invokes the transform(a, b, c, d, e, f) method with the same arguments.
+    The setTransform(\a a, \a b, \a c, \a d, \a e, \a f) method actually
+    resets the current transform to the identity matrix, and then invokes
+    the transform(\a a, \a b, \a c, \a d, \a e, \a f) method with the same
+    arguments.
 
     \sa setTransform()
 */
@@ -1626,9 +1631,12 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_createLinearGradient(const
 }
 
 /*!
-  \qmlmethod object QtQuick::Context2D::createRadialGradient(real x0, real y0, real r0, real x1, real y1, real r1)
-   Returns a CanvasGradient object that represents a radial gradient that paints along the cone given by the start circle with
-   origin (x0, y0) and radius r0, and the end circle with origin (x1, y1) and radius r1.
+    \qmlmethod object QtQuick::Context2D::createRadialGradient(real x0, real y0, real r0, real x1, real y1, real r1)
+
+    Returns a CanvasGradient object that represents a radial gradient that
+    paints along the cone given by the start circle with origin (\a x0, \a y0)
+    and radius \a r0, and the end circle with origin (\a x1, \a y1) and radius
+    \a r1.
 
     \sa CanvasGradient::addColorStop()
     \sa createLinearGradient()
@@ -1679,8 +1687,10 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_createRadialGradient(const
 
 /*!
   \qmlmethod object QtQuick::Context2D::createConicalGradient(real x, real y, real angle)
-   Returns a CanvasGradient object that represents a conical gradient that interpolate colors counter-clockwise around a center point (\c x, \c y)
-   with start angle \c angle in units of radians.
+
+   Returns a CanvasGradient object that represents a conical gradient that
+   interpolates colors counter-clockwise around a center point (\a x, \a y)
+   with a start angle \a angle in units of radians.
 
     \sa CanvasGradient::addColorStop()
     \sa createLinearGradient()
@@ -2263,8 +2273,10 @@ QV4::ReturnedValue QQuickJSContext2D::method_set_path(const QV4::FunctionObject
 
 //rects
 /*!
-  \qmlmethod object QtQuick::Context2D::clearRect(real x, real y, real w, real h)
-  Clears all pixels on the canvas in the given rectangle to transparent black.
+    \qmlmethod object QtQuick::Context2D::clearRect(real x, real y, real w, real h)
+
+    Clears all pixels on the canvas in the rectangle specified by
+    (\a x, \a y, \a w, \a h) to transparent black.
   */
 QV4::ReturnedValue QQuickJSContext2DPrototype::method_clearRect(const QV4::FunctionObject *b, const QV4::Value *thisObject, const QV4::Value *argv, int argc)
 {
@@ -2283,8 +2295,9 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_clearRect(const QV4::Funct
 
 }
 /*!
-  \qmlmethod object QtQuick::Context2D::fillRect(real x, real y, real w, real h)
-   Paint the specified rectangular area using the fillStyle.
+    \qmlmethod object QtQuick::Context2D::fillRect(real x, real y, real w, real h)
+
+    Paints a rectangular area specified by (\a x, \a y, \a w, \a h) using fillStyle.
 
    \sa fillStyle
   */
@@ -2301,14 +2314,12 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_fillRect(const QV4::Functi
 }
 
 /*!
-  \qmlmethod object QtQuick::Context2D::strokeRect(real x, real y, real w, real h)
-   Stroke the specified rectangle's path using the strokeStyle, lineWidth, lineJoin,
-   and (if appropriate) miterLimit attributes.
-
-   \sa strokeStyle
-   \sa lineWidth
-   \sa lineJoin
-   \sa miterLimit
+    \qmlmethod object QtQuick::Context2D::strokeRect(real x, real y, real w, real h)
+
+    Strokes the path of the rectangle specified by (\a x, \a y, \a w, \a h) using
+    strokeStyle, lineWidth, lineJoin, and (if appropriate) miterLimit attributes.
+
+   \sa strokeStyle, lineWidth, lineJoin, miterLimit
   */
 QV4::ReturnedValue QQuickJSContext2DPrototype::method_strokeRect(const QV4::FunctionObject *b, const QV4::Value *thisObject, const QV4::Value *argv, int argc)
 {
@@ -2332,7 +2343,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_strokeRect(const QV4::Func
     circle whose center is at the point (\a x, \a y) and whose radius is
     \a radius.
 
-    Both \c startAngle and \c endAngle are measured from the x-axis in radians.
+    Both \a startAngle and \a endAngle are measured from the x-axis in radians.
 
     \image qml-item-canvas-arc.png
 
@@ -2439,10 +2450,11 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_beginPath(const QV4::Funct
 /*!
   \qmlmethod object QtQuick::Context2D::bezierCurveTo(real cp1x, real cp1y, real cp2x, real cp2y, real x, real y)
 
-  Adds a cubic bezier curve between the current position and the given endPoint using the control points specified by (\c cp1x, cp1y),
-  and (\c cp2x, \c cp2y).
-  After the curve is added, the current position is updated to be at the end point (\c x, \c y) of the curve.
+  Adds a cubic bezier curve between the current position and the given endPoint using the control points specified by (\a {cp1x}, \a {cp1y}),
+  and (\a {cp2x}, \a {cp2y}).
+  After the curve is added, the current position is updated to be at the end point (\a {x}, \a {y}) of the curve.
   The following code produces the path shown below:
+
   \code
   ctx.strokeStyle = Qt.rgba(0, 0, 0, 1);
   ctx.lineWidth = 1;
@@ -2451,7 +2463,9 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_beginPath(const QV4::Funct
   ctx.bezierCurveTo(-10, 90, 210, 90, 180, 0);
   ctx.stroke();
   \endcode
+
    \image qml-item-canvas-bezierCurveTo.png
+
   \sa {http://www.w3.org/TR/2dcontext/#dom-context-2d-beziercurveto}{W3C 2d context standard for bezierCurveTo}
   \sa {http://www.openrise.com/lab/FlowerPower/}{The beautiful flower demo by using bezierCurveTo}
   */
@@ -2550,7 +2564,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_fill(const QV4::FunctionOb
 /*!
   \qmlmethod object QtQuick::Context2D::lineTo(real x, real y)
 
-   Draws a line from the current position to the point (x, y).
+   Draws a line from the current position to the point at (\a x, \a y).
  */
 QV4::ReturnedValue QQuickJSContext2DPrototype::method_lineTo(const QV4::FunctionObject *b, const QV4::Value *thisObject, const QV4::Value *argv, int argc)
 {
@@ -2574,7 +2588,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_lineTo(const QV4::Function
 /*!
   \qmlmethod object QtQuick::Context2D::moveTo(real x, real y)
 
-   Creates a new subpath with the given point.
+   Creates a new subpath with a point at (\a x, \a y).
  */
 QV4::ReturnedValue QQuickJSContext2DPrototype::method_moveTo(const QV4::FunctionObject *b, const QV4::Value *thisObject, const QV4::Value *argv, int argc)
 {
@@ -2595,11 +2609,12 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_moveTo(const QV4::Function
 }
 
 /*!
-  \qmlmethod object QtQuick::Context2D::quadraticCurveTo(real cpx, real cpy, real x, real y)
+    \qmlmethod object QtQuick::Context2D::quadraticCurveTo(real cpx, real cpy, real x, real y)
 
-   Adds a quadratic bezier curve between the current point and the endpoint (\c x, \c y) with the control point specified by (\c cpx, \c cpy).
+    Adds a quadratic bezier curve between the current point and the endpoint
+    (\a x, \a y) with the control point specified by (\a cpx, \a cpy).
 
-   See \l{http://www.w3.org/TR/2dcontext/#dom-context-2d-quadraticcurveto}{W3C 2d context standard for quadraticCurveTo}
+    \sa {http://www.w3.org/TR/2dcontext/#dom-context-2d-quadraticcurveto}{W3C 2d context standard for quadraticCurveTo}
  */
 QV4::ReturnedValue QQuickJSContext2DPrototype::method_quadraticCurveTo(const QV4::FunctionObject *b, const QV4::Value *thisObject, const QV4::Value *argv, int argc)
 {
@@ -2623,9 +2638,10 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_quadraticCurveTo(const QV4
 }
 
 /*!
-  \qmlmethod object QtQuick::Context2D::rect(real x, real y, real w, real h)
+    \qmlmethod object QtQuick::Context2D::rect(real x, real y, real w, real h)
 
-   Adds a rectangle at position (\c x, \c y), with the given width \c w and height \c h, as a closed subpath.
+    Adds a rectangle at position (\a x, \a y), with the given width \a w and
+    height \a h, as a closed subpath.
  */
 QV4::ReturnedValue QQuickJSContext2DPrototype::method_rect(const QV4::FunctionObject *b, const QV4::Value *thisObject, const QV4::Value *argv, int argc)
 {
@@ -2640,10 +2656,11 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_rect(const QV4::FunctionOb
 }
 
 /*!
-  \qmlmethod object QtQuick::Context2D::roundedRect(real x, real y, real w, real h,  real xRadius, real yRadius)
+    \qmlmethod object QtQuick::Context2D::roundedRect(real x, real y, real w, real h, real xRadius, real yRadius)
 
-   Adds the given rectangle rect with rounded corners to the path. The \c xRadius and \c yRadius arguments specify the radius of the
-   ellipses defining the corners of the rounded rectangle.
+    Adds a rounded-corner rectangle, specified by (\a x, \a y, \a w, \a h), to the path.
+    The \a xRadius and \a yRadius arguments specify the radius of the
+    ellipses defining the corners of the rounded rectangle.
  */
 QV4::ReturnedValue QQuickJSContext2DPrototype::method_roundedRect(const QV4::FunctionObject *b, const QV4::Value *thisObject, const QV4::Value *argv, int argc)
 {
@@ -2663,12 +2680,14 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_roundedRect(const QV4::Fun
 }
 
 /*!
-  \qmlmethod object QtQuick::Context2D::ellipse(real x, real y, real w, real h)
+    \qmlmethod object QtQuick::Context2D::ellipse(real x, real y, real w, real h)
 
-  Creates an ellipse within the bounding rectangle defined by its top-left corner at (\a x, \ y), width \a w and height \a h,
-  and adds it to the path as a closed subpath.
+    Creates an ellipse within the bounding rectangle defined by its top-left
+    corner at (\a x, \a y), width \a w and height \a h, and adds it to the
+    path as a closed subpath.
 
-  The ellipse is composed of a clockwise curve, starting and finishing at zero degrees (the 3 o'clock position).
+    The ellipse is composed of a clockwise curve, starting and finishing at
+    zero degrees (the 3 o'clock position).
  */
 QV4::ReturnedValue QQuickJSContext2DPrototype::method_ellipse(const QV4::FunctionObject *b, const QV4::Value *thisObject, const QV4::Value *argv, int argc)
 {
@@ -2686,8 +2705,11 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_ellipse(const QV4::Functio
 /*!
   \qmlmethod object QtQuick::Context2D::text(string text, real x, real y)
 
-  Adds the given \c text to the path as a set of closed subpaths created from the current context font supplied.
-  The subpaths are positioned so that the left end of the text's baseline lies at the point specified by (\c x, \c y).
+  Adds the given \a text to the path as a set of closed subpaths created
+  from the current context font supplied.
+
+  The subpaths are positioned so that the left end of the text's baseline
+  lies at the point specified by (\a x, \a y).
  */
 QV4::ReturnedValue QQuickJSContext2DPrototype::method_text(const QV4::FunctionObject *b, const QV4::Value *thisObject, const QV4::Value *argv, int argc)
 {
@@ -2712,9 +2734,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_text(const QV4::FunctionOb
 
    Strokes the subpaths with the current stroke style.
 
-   See \l{http://www.w3.org/TR/2dcontext/#dom-context-2d-stroke}{W3C 2d context standard for stroke}
-
-   \sa strokeStyle
+   \sa strokeStyle, {http://www.w3.org/TR/2dcontext/#dom-context-2d-stroke}{W3C 2d context standard for stroke}
   */
 QV4::ReturnedValue QQuickJSContext2DPrototype::method_stroke(const QV4::FunctionObject *b, const QV4::Value *thisObject, const QV4::Value *, int)
 {
@@ -2730,7 +2750,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_stroke(const QV4::Function
 /*!
   \qmlmethod object QtQuick::Context2D::isPointInPath(real x, real y)
 
-   Returns true if the given point is in the current path.
+   Returns \c true if the point (\a x, \a y) is in the current path.
 
    \sa {http://www.w3.org/TR/2dcontext/#dom-context-2d-ispointinpath}{W3C 2d context standard for isPointInPath}
   */
@@ -2948,7 +2968,9 @@ QV4::ReturnedValue QQuickJSContext2D::method_set_textBaseline(const QV4::Functio
 
 /*!
   \qmlmethod object QtQuick::Context2D::fillText(text, x, y)
-  Fills the given text at the given position.
+
+  Fills the specified \a text at the given position (\a x, \a y).
+
   \sa font
   \sa textAlign
   \sa textBaseline
@@ -2972,13 +2994,15 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_fillText(const QV4::Functi
     RETURN_RESULT(*thisObject);
 }
 /*!
-  \qmlmethod object QtQuick::Context2D::strokeText(text, x, y)
-  Strokes the given text at the given position.
-  \sa font
-  \sa textAlign
-  \sa textBaseline
-  \sa fillText
-  */
+    \qmlmethod object QtQuick::Context2D::strokeText(text, x, y)
+
+    Strokes the given \a text at a position specified by (\a x, \a y).
+
+    \sa font
+    \sa textAlign
+    \sa textBaseline
+    \sa fillText
+*/
 QV4::ReturnedValue QQuickJSContext2DPrototype::method_strokeText(const QV4::FunctionObject *b, const QV4::Value *thisObject, const QV4::Value *argv, int argc)
 {
     QV4::Scope scope(b);
@@ -3414,8 +3438,10 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_createImageData(const QV4:
 }
 
 /*!
-  \qmlmethod CanvasImageData QtQuick::Context2D::getImageData(real sx, real sy, real sw, real sh)
-  Returns an CanvasImageData object containing the image data for the given rectangle of the canvas.
+    \qmlmethod CanvasImageData QtQuick::Context2D::getImageData(real x, real y, real w, real h)
+
+    Returns an CanvasImageData object containing the image data for the canvas
+    rectangle specified by (\a x, \a y, \a w, \a h).
   */
 QV4::ReturnedValue QQuickJSContext2DPrototype::method_getImageData(const QV4::FunctionObject *b, const QV4::Value *thisObject, const QV4::Value *argv, int argc)
 {
@@ -3441,8 +3467,13 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_getImageData(const QV4::Fu
 }
 
 /*!
-  \qmlmethod object QtQuick::Context2D::putImageData(CanvasImageData imageData, real dx, real dy, real dirtyX, real dirtyY, real dirtyWidth, real dirtyHeight)
-  Paints the data from the given ImageData object onto the canvas. If a dirty rectangle (\a dirtyX, \a dirtyY, \a dirtyWidth, \a dirtyHeight) is provided, only the pixels from that rectangle are painted.
+    \qmlmethod object QtQuick::Context2D::putImageData(CanvasImageData imageData, real dx, real dy, real dirtyX, real dirtyY, real dirtyWidth, real dirtyHeight)
+
+    Paints the data from the given \a imageData object onto the canvas at
+    (\a dx, \a dy).
+
+    If a dirty rectangle (\a dirtyX, \a dirtyY, \a dirtyWidth, \a dirtyHeight)
+    is provided, only the pixels from that rectangle are painted.
   */
 QV4::ReturnedValue QQuickJSContext2DPrototype::method_putImageData(const QV4::FunctionObject *b, const QV4::Value *thisObject, const QV4::Value *argv, int argc)
 {
@@ -3535,16 +3566,18 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_putImageData(const QV4::Fu
   */
 
 /*!
-  \qmlmethod CanvasGradient QtQuick::CanvasGradient::addColorStop(real offsetof, string color)
-  Adds a color stop with the given color to the gradient at the given offset.
-  0.0 is the offset at one end of the gradient, 1.0 is the offset at the other end.
+    \qmlmethod CanvasGradient QtQuick::CanvasGradient::addColorStop(real offset, string color)
 
-  For example:
-  \code
-  var gradient = ctx.createLinearGradient(0, 0, 100, 100);
-  gradient.addColorStop(0.3, Qt.rgba(1, 0, 0, 1));
-  gradient.addColorStop(0.7, 'rgba(0, 255, 255, 1');
-  \endcode
+    Adds a color stop with the given \a color to the gradient at the given \a offset.
+    0.0 is the offset at one end of the gradient, 1.0 is the offset at the other end.
+
+    For example:
+
+    \code
+    var gradient = ctx.createLinearGradient(0, 0, 100, 100);
+    gradient.addColorStop(0.3, Qt.rgba(1, 0, 0, 1));
+    gradient.addColorStop(0.7, 'rgba(0, 255, 255, 1');
+    \endcode
   */
 QV4::ReturnedValue QQuickContext2DStyle::gradient_proto_addColorStop(const QV4::FunctionObject *b, const QV4::Value *thisObject, const QV4::Value *argv, int argc)
 {
diff --git a/src/quick/items/qquickdrag.cpp b/src/quick/items/qquickdrag.cpp
index 028b2b153d..8fe1929a2c 100644
--- a/src/quick/items/qquickdrag.cpp
+++ b/src/quick/items/qquickdrag.cpp
@@ -752,7 +752,11 @@ void QQuickDragAttached::cancel()
     This signal is emitted when a drag finishes and the drag was started with the
     \l startDrag() method or started automatically using the \l dragType property.
 
+    \a dropAction holds the action accepted by the target item.
+
     The corresponding handler is \c onDragFinished.
+
+    \sa drop()
  */
 
 Qt::DropAction QQuickDragAttachedPrivate::startDrag(Qt::DropActions supportedActions)
diff --git a/src/quick/items/qquickdroparea.cpp b/src/quick/items/qquickdroparea.cpp
index f96d6b6244..76be8cc261 100644
--- a/src/quick/items/qquickdroparea.cpp
+++ b/src/quick/items/qquickdroparea.cpp
@@ -211,7 +211,7 @@ qreal QQuickDropAreaDrag::y() const
 /*!
     \qmlsignal QtQuick::DropArea::positionChanged(DragEvent drag)
 
-    This signal is emitted when the position of a drag has changed.
+    This signal is emitted when the position of a \a drag has changed.
 
     The corresponding handler is \c onPositionChanged.
 */
@@ -313,7 +313,7 @@ void QQuickDropArea::dragLeaveEvent(QDragLeaveEvent *)
 /*!
     \qmlsignal QtQuick::DropArea::dropped(DragEvent drop)
 
-    This signal is emitted when a drop event occurs within the bounds of
+    This signal is emitted when a \a drop event occurs within the bounds of
     a DropArea.
 
     The corresponding handler is \c onDropped.
diff --git a/src/quick/items/qquickgridview.cpp b/src/quick/items/qquickgridview.cpp
index fecfa5fd2d..e69e9cff46 100644
--- a/src/quick/items/qquickgridview.cpp
+++ b/src/quick/items/qquickgridview.cpp
@@ -1761,7 +1761,7 @@ void QQuickGridView::setSnapMode(SnapMode mode)
 
     \list
     \li The view is first created
-    \li The view's \l model changes
+    \li The view's \l model changes in such a way that the visible delegates are completely replaced
     \li The view's \l model is \l {QAbstractItemModel::reset()}{reset}, if the model is a QAbstractItemModel subclass
     \endlist
 
@@ -1779,6 +1779,28 @@ void QQuickGridView::setSnapMode(SnapMode mode)
     When the view is initialized, the view will create all the necessary items for the view,
     then animate them to their correct positions within the view over one second.
 
+    However when scrolling the view later, the populate transition does not
+    run, even though delegates are being instantiated as they become visible.
+    When the model changes in a way that new delegates become visible, the
+    \l add transition is the one that runs. So you should not depend on the
+    \c populate transition to initialize properties in the delegate, because it
+    does not apply to every delegate. If your animation sets the \c to value of
+    a property, the property should initially have the \c to value, and the
+    animation should set the \c from value in case it is animated:
+
+    \code
+    GridView {
+        ...
+        delegate: Rectangle {
+            opacity: 1 // not necessary because it's the default; but don't set 0
+            ...
+        }
+        populate: Transition {
+            NumberAnimation { property: "opacity"; from: 0; to: 1; duration: 1000 }
+        }
+    }
+    \endcode
+
     For more details and examples on how to use view transitions, see the ViewTransition
     documentation.
 
diff --git a/src/quick/items/qquickitemsmodule.cpp b/src/quick/items/qquickitemsmodule.cpp
index f2098f6732..7bc6eefe0a 100644
--- a/src/quick/items/qquickitemsmodule.cpp
+++ b/src/quick/items/qquickitemsmodule.cpp
@@ -470,7 +470,9 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor)
     qRegisterMetaType<QQuickHandlerPoint>();
 
     // The rest of the 5.12 revisions
+#if QT_CONFIG(quick_sprite)
     qmlRegisterType<QQuickAnimatedSprite, 12>("QtQuick", 2, 12, "AnimatedSprite");
+#endif
     qmlRegisterType<QQuickGradient, 12>(uri, 2, 12, "Gradient");
     qmlRegisterType<QQuickFlickable, 12>(uri, 2, 12, "Flickable");
     qmlRegisterType<QQuickText, 12>(uri, 2, 12, "Text");
diff --git a/src/quick/items/qquicklistview.cpp b/src/quick/items/qquicklistview.cpp
index 146917c679..8b70ffd0d7 100644
--- a/src/quick/items/qquicklistview.cpp
+++ b/src/quick/items/qquicklistview.cpp
@@ -2727,7 +2727,7 @@ void QQuickListView::setFooterPositioning(QQuickListView::FooterPositioning posi
 
     \list
     \li The view is first created
-    \li The view's \l model changes
+    \li The view's \l model changes in such a way that the visible delegates are completely replaced
     \li The view's \l model is \l {QAbstractItemModel::reset()}{reset}, if the model is a QAbstractItemModel subclass
     \endlist
 
@@ -2745,6 +2745,27 @@ void QQuickListView::setFooterPositioning(QQuickListView::FooterPositioning posi
     When the view is initialized, the view will create all the necessary items for the view,
     then animate them to their correct positions within the view over one second.
 
+    However when scrolling the view later, the populate transition does not
+    run, even though delegates are being instantiated as they become visible.
+    When the model changes in a way that new delegates become visible, the
+    \l add transition is the one that runs. So you should not depend on the
+    \c populate transition to initialize properties in the delegate, because it
+    does not apply to every delegate. If your animation sets the \c to value of
+    a property, the property should initially have the \c to value, and the
+    animation should set the \c from value in case it is animated:
+
+    \code
+    ListView {
+        ...
+        delegate: Rectangle {
+            opacity: 1 // not necessary because it's the default
+        }
+        populate: Transition {
+            NumberAnimation { property: "opacity"; from: 0; to: 1; duration: 1000 }
+        }
+    }
+    \endcode
+
     For more details and examples on how to use view transitions, see the ViewTransition
     documentation.
 
diff --git a/src/quick/items/qquickmousearea.cpp b/src/quick/items/qquickmousearea.cpp
index a8f09dc8be..a0c46d0bc6 100644
--- a/src/quick/items/qquickmousearea.cpp
+++ b/src/quick/items/qquickmousearea.cpp
@@ -431,7 +431,7 @@ bool QQuickMouseAreaPrivate::propagateHelper(QQuickMouseEvent *ev, QQuickItem *i
 
     This signal is emitted in response to both mouse wheel and trackpad scroll gestures.
 
-    The \l {WheelEvent}{wheel} parameter provides information about the event, including the x and y
+    The \a wheel parameter provides information about the event, including the x and y
     position, any buttons currently pressed, and information about the wheel movement, including
     angleDelta and pixelDelta.
 
diff --git a/src/quick/items/qquickmultipointtoucharea.cpp b/src/quick/items/qquickmultipointtoucharea.cpp
index 3eca535a67..70426a6a8c 100644
--- a/src/quick/items/qquickmultipointtoucharea.cpp
+++ b/src/quick/items/qquickmultipointtoucharea.cpp
@@ -410,7 +410,7 @@ void QQuickTouchPoint::setUniqueId(const QPointingDeviceUniqueId &id)
     area should grab the current touch points. By default they will not be grabbed; to grab them call \c gesture.grab(). If the
     gesture is not grabbed, the nesting Flickable, for example, would also have an opportunity to grab.
 
-    The gesture object also includes information on the current set of \c touchPoints and the \c dragThreshold.
+    The \a gesture object also includes information on the current set of \c touchPoints and the \c dragThreshold.
 
     The corresponding handler is \c onGestureStarted.
 */
diff --git a/src/quick/items/qquickscreen.cpp b/src/quick/items/qquickscreen.cpp
index b057fd9d8f..b17e505f4f 100644
--- a/src/quick/items/qquickscreen.cpp
+++ b/src/quick/items/qquickscreen.cpp
@@ -229,7 +229,8 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmlattachedmethod int Screen::angleBetween(Qt::ScreenOrientation a, Qt::ScreenOrientation b)
 
-    Returns the rotation angle, in degrees, between the two specified angles.
+    Returns the rotation angle, in degrees, between the specified screen
+    orientations \a a and \a b.
 */
 
 /*!
diff --git a/src/quick/items/qquicktableview.cpp b/src/quick/items/qquicktableview.cpp
index 75e0a1018f..db579c74bc 100644
--- a/src/quick/items/qquicktableview.cpp
+++ b/src/quick/items/qquicktableview.cpp
@@ -1823,18 +1823,9 @@ void QQuickTableViewPrivate::beginRebuildTable()
 
 void QQuickTableViewPrivate::layoutAfterLoadingInitialTable()
 {
-    if (rebuildOptions.testFlag(RebuildOption::LayoutOnly)
-            || rowHeightProvider.isUndefined() || columnWidthProvider.isUndefined()) {
-        // Since we don't have both size providers, we need to calculate the
-        // size of each row and column based on the size of the delegate items.
-        // This couldn't be done while we were loading the initial rows and
-        // columns, since during the process, we didn't have all the items
-        // available yet for the calculation. So we do it now. The exception
-        // is if we specifically only requested a relayout.
-        clearEdgeSizeCache();
-        relayoutTableItems();
-        syncLoadedTableRectFromLoadedTable();
-    }
+    clearEdgeSizeCache();
+    relayoutTableItems();
+    syncLoadedTableRectFromLoadedTable();
 
     if (syncView || rebuildOptions.testFlag(RebuildOption::All)) {
         // We try to limit how often we update the content size. The main reason is that is has a
diff --git a/src/quick/items/qquicktextcontrol.cpp b/src/quick/items/qquicktextcontrol.cpp
index 5c4ecd60aa..ab3b0c4605 100644
--- a/src/quick/items/qquicktextcontrol.cpp
+++ b/src/quick/items/qquicktextcontrol.cpp
@@ -794,8 +794,6 @@ void QQuickTextControl::timerEvent(QTimerEvent *e)
         d->cursorOn = !d->cursorOn;
 
         d->repaintCursor();
-    } else if (e->timerId() == d->tripleClickTimer.timerId()) {
-        d->tripleClickTimer.stop();
     }
 }
 
@@ -1058,7 +1056,7 @@ void QQuickTextControlPrivate::mousePressEvent(QMouseEvent *e, const QPointF &po
     commitPreedit();
 #endif
 
-    if (tripleClickTimer.isActive()
+    if ((e->timestamp() < (timestampAtLastDoubleClick + QGuiApplication::styleHints()->mouseDoubleClickInterval()))
         && ((pos - tripleClickPoint).toPoint().manhattanLength() < QGuiApplication::styleHints()->startDragDistance())) {
 
         cursor.movePosition(QTextCursor::StartOfBlock);
@@ -1068,7 +1066,7 @@ void QQuickTextControlPrivate::mousePressEvent(QMouseEvent *e, const QPointF &po
 
         anchorOnMousePress = QString();
 
-        tripleClickTimer.stop();
+        timestampAtLastDoubleClick = 0; // do not enter this condition in case of 4(!) rapid clicks
     } else {
         int cursorPos = q->hitTest(pos, Qt::FuzzyHit);
         if (cursorPos == -1) {
@@ -1267,7 +1265,7 @@ void QQuickTextControlPrivate::mouseDoubleClickEvent(QMouseEvent *e, const QPoin
         selectedWordOnDoubleClick = cursor;
 
         tripleClickPoint = pos;
-        tripleClickTimer.start(QGuiApplication::styleHints()->mouseDoubleClickInterval(), q);
+        timestampAtLastDoubleClick = e->timestamp();
         if (doEmit) {
             selectionChanged();
 #if QT_CONFIG(clipboard)
diff --git a/src/quick/items/qquicktextcontrol_p_p.h b/src/quick/items/qquicktextcontrol_p_p.h
index 5648c31e21..d52200b49d 100644
--- a/src/quick/items/qquicktextcontrol_p_p.h
+++ b/src/quick/items/qquicktextcontrol_p_p.h
@@ -143,7 +143,7 @@ public:
     QTextBlock blockWithMarkerUnderMousePress;
 
     QBasicTimer cursorBlinkTimer;
-    QBasicTimer tripleClickTimer;
+    ulong timestampAtLastDoubleClick = 0;   // will only be set at a double click
 
 #if QT_CONFIG(im)
     int preeditCursor;
diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp
index 7414d7fd6a..c4e9c0d316 100644
--- a/src/quick/items/qquicktextedit.cpp
+++ b/src/quick/items/qquicktextedit.cpp
@@ -1074,7 +1074,7 @@ int QQuickTextEdit::positionAt(qreal x, qreal y) const
 }
 
 /*!
-    \qmlmethod QtQuick::TextEdit::moveCursorSelection(int position, SelectionMode mode = TextEdit.SelectCharacters)
+    \qmlmethod QtQuick::TextEdit::moveCursorSelection(int position, SelectionMode mode)
 
     Moves the cursor to \a position and updates the selection according to the optional \a mode
     parameter. (To only move the cursor, set the \l cursorPosition property.)
@@ -1085,7 +1085,7 @@ int QQuickTextEdit::positionAt(qreal x, qreal y) const
     text range.
 
     The selection mode specifies whether the selection is updated on a per character or a per word
-    basis.  If not specified the selection mode will default to TextEdit.SelectCharacters.
+    basis. If not specified the selection mode will default to \c {TextEdit.SelectCharacters}.
 
     \list
     \li TextEdit.SelectCharacters - Sets either the selectionStart or selectionEnd (whichever was at
@@ -2828,7 +2828,7 @@ QString QQuickTextEdit::getFormattedText(int start, int end) const
 /*!
     \qmlmethod QtQuick::TextEdit::insert(int position, string text)
 
-    Inserts \a text into the TextEdit at position.
+    Inserts \a text into the TextEdit at \a position.
 */
 void QQuickTextEdit::insert(int position, const QString &text)
 {
diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp
index 598ebb7a68..b1ad6a1c15 100644
--- a/src/quick/items/qquicktextinput.cpp
+++ b/src/quick/items/qquicktextinput.cpp
@@ -1359,8 +1359,8 @@ void QQuickTextInput::createCursor()
 /*!
     \qmlmethod rect QtQuick::TextInput::positionToRectangle(int pos)
 
-    This function takes a character position and returns the rectangle that the
-    cursor would occupy, if it was placed at that character position.
+    This function takes a character position \a pos and returns the rectangle
+    that the cursor would occupy, if it was placed at that character position.
 
     This is similar to setting the cursorPosition, and then querying the cursor
     rectangle, but the cursorPosition is not changed.
@@ -1390,10 +1390,10 @@ QRectF QQuickTextInput::positionToRectangle(int pos) const
 }
 
 /*!
-    \qmlmethod int QtQuick::TextInput::positionAt(real x, real y, CursorPosition position = CursorBetweenCharacters)
+    \qmlmethod int QtQuick::TextInput::positionAt(real x, real y, CursorPosition position)
 
     This function returns the character position at
-    x and y pixels from the top left  of the textInput. Position 0 is before the
+    \a x and \a y pixels from the top left of the textInput. Position 0 is before the
     first character, position 1 is after the first character but before the second,
     and so on until position text.length, which is after all characters.
 
@@ -1403,12 +1403,13 @@ QRectF QQuickTextInput::positionToRectangle(int pos) const
     the first line and if it is below the text the position of the nearest character
     on the last line will be returned.
 
-    The cursor position type specifies how the cursor position should be resolved.
+    The cursor \a position parameter specifies how the cursor position should be resolved:
 
-    \list
-    \li TextInput.CursorBetweenCharacters - Returns the position between characters that is nearest x.
-    \li TextInput.CursorOnCharacter - Returns the position before the character that is nearest x.
-    \endlist
+    \value TextInput.CursorBetweenCharacters
+           Returns the position between characters that is nearest x.
+           This is the default value.
+    \value TextInput.CursorOnCharacter
+           Returns the position before the character that is nearest x.
 */
 
 void QQuickTextInput::positionAt(QQmlV4Function *args) const
@@ -2132,7 +2133,7 @@ void QQuickTextInput::redo()
 /*!
     \qmlmethod QtQuick::TextInput::insert(int position, string text)
 
-    Inserts \a text into the TextInput at position.
+    Inserts \a text into the TextInput at \a position.
 */
 
 void QQuickTextInput::insert(int position, const QString &text)
@@ -2539,7 +2540,7 @@ void QQuickTextInput::moveCursorSelection(int position)
 }
 
 /*!
-    \qmlmethod QtQuick::TextInput::moveCursorSelection(int position, SelectionMode mode = TextInput.SelectCharacters)
+    \qmlmethod QtQuick::TextInput::moveCursorSelection(int position, SelectionMode mode)
 
     Moves the cursor to \a position and updates the selection according to the optional \a mode
     parameter.  (To only move the cursor, set the \l cursorPosition property.)
@@ -2550,7 +2551,7 @@ void QQuickTextInput::moveCursorSelection(int position)
     text range.
 
     The selection mode specifies whether the selection is updated on a per character or a per word
-    basis.  If not specified the selection mode will default to TextInput.SelectCharacters.
+    basis.  If not specified the selection mode will default to \c {TextInput.SelectCharacters}.
 
     \list
     \li TextInput.SelectCharacters - Sets either the selectionStart or selectionEnd (whichever was at