diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp index b78a799287c46a634810c4cbae12f173fd6d456f..76f795b9b88da2a87fffd25328ed50cd0f105beb 100644 --- a/src/quick/items/context2d/qquickcontext2d.cpp +++ b/src/quick/items/context2d/qquickcontext2d.cpp @@ -2284,7 +2284,7 @@ static v8::Handle<v8::Value> ctx2d_measureText(const v8::Arguments &args) /*! \qmlmethod QtQuick2::Context2D::drawImage(variant image, real sx, real sy, real sw, sh, real dx, real dy, real dw, dh) This is an overloaded function. - Draws the given item as \a image from source point (\a sx, \a sy) and source width \sw, source height \sh + Draws the given item as \a image from source point (\a sx, \a sy) and source width \a sw, source height \a sh onto the canvas at point (\a dx, \a dy) and with width \a dw, height \a dh. diff --git a/src/quick/items/qquickshadereffect.cpp b/src/quick/items/qquickshadereffect.cpp index 6695c60d5183821ee856af28f16dc0dbe94b696a..be3023036b32dfa4fce807a4f01a77be37e2aac1 100644 --- a/src/quick/items/qquickshadereffect.cpp +++ b/src/quick/items/qquickshadereffect.cpp @@ -595,6 +595,7 @@ void QQuickShaderEffectCommon::propertyChanged(QQuickItem *item, int mappedId, \l blending is enabled, source-over blending is used. However, additive blending can be achieved by outputting zero in the alpha channel. + \table \row \li \image declarative-shadereffectitem.png \li \qml @@ -628,7 +629,7 @@ void QQuickShaderEffectCommon::propertyChanged(QQuickItem *item, int mappedId, } } \endqml - \endrow + \endtable By default, the ShaderEffect consists of four vertices, one for each corner. For non-linear vertex transformations, like page curl, you can diff --git a/src/quick/items/qquickshadereffectmesh.cpp b/src/quick/items/qquickshadereffectmesh.cpp index d1110c5a5b909854c77cb740d7ed224872043239..52a3a0c37576673053fc64ae652c337bd1d15953 100644 --- a/src/quick/items/qquickshadereffectmesh.cpp +++ b/src/quick/items/qquickshadereffectmesh.cpp @@ -168,6 +168,7 @@ QSGGeometry *QQuickGridMesh::updateGeometry(QSGGeometry *geometry, const QVector For non-linear vertex transformations, you probably want to set the resolution higher. + \table \row \li \image declarative-gridmesh.png \li \qml @@ -199,7 +200,7 @@ QSGGeometry *QQuickGridMesh::updateGeometry(QSGGeometry *geometry, const QVector }" } \endqml - \endrow + \endtable */ void QQuickGridMesh::setResolution(const QSize &res) diff --git a/src/quick/items/qquickshadereffectsource.cpp b/src/quick/items/qquickshadereffectsource.cpp index b22191923a0f7f3adfff8a1a9bcf1ae9e4f13d31..3804c933c8f03f4e7eb4fab597a6c012e1107ce6 100644 --- a/src/quick/items/qquickshadereffectsource.cpp +++ b/src/quick/items/qquickshadereffectsource.cpp @@ -510,7 +510,6 @@ QImage QQuickShaderEffectTexture::toImage() const } } \endqml - \endrow \endtable The ShaderEffectSource type does not redirect any mouse or keyboard diff --git a/src/quick/util/qquicktransition.cpp b/src/quick/util/qquicktransition.cpp index de32fefd18240795ba70ef1ec3d9aef7ecc180e9..32c97565ce473a9eb57ae92ddcc224bf5fcd47fe 100644 --- a/src/quick/util/qquicktransition.cpp +++ b/src/quick/util/qquicktransition.cpp @@ -292,7 +292,7 @@ QQuickTransitionInstance *QQuickTransition::prepare(QQuickStateOperation::Action The animation would only be applied when changing from the default state to the "brighter" state (i.e. when the mouse is pressed, but not on release). - Multiple \c to and \from values can be set by using a comma-separated string. + Multiple \c to and \c from values can be set by using a comma-separated string. \sa reversible */