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

 Conflicts:
	src/imports/qtquick2/plugins.qmltypes
	src/quick/items/qquickitemsmodule.cpp

Change-Id: I841c65c9c131354788b4f3fcfe3d7ed27be316d5

2 files changed, 138 insertions, 99 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)
 {