diff options
| author | Jerome Pasion <jerome.pasion@digia.com> | 2013-09-24 16:41:12 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-25 13:51:51 +0200 |
| commit | 0e62896fdcbad014177ba11d88bbe46eb496ab2d (patch) | |
| tree | 97e7cb60ca408a407134eef6e9deb94a060227dd /src/quick/items/context2d | |
| parent | 89042598c4005c82a64e63ea6f628e24dc5ca979 (diff) | |
Doc: Fixed and updated Qt Quick's \qmlmodule page
-incremented version to Qt Quick 2.2 (in \qmlmodule page)
-import changed to QtQuick 2.2
-\inqmlmodule no longer needs the version. QDoc will ignore the version
but it is better to remove it now to avoid confusion
Task-number: QTBUG-32172
Change-Id: I40b52e59667014720be40a35b3a8fb9836825e31
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Diffstat (limited to 'src/quick/items/context2d')
| -rw-r--r-- | src/quick/items/context2d/qquickcanvasitem.cpp | 2 | ||||
| -rw-r--r-- | src/quick/items/context2d/qquickcontext2d.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp index bb9997593b..f21abdab67 100644 --- a/src/quick/items/context2d/qquickcanvasitem.cpp +++ b/src/quick/items/context2d/qquickcanvasitem.cpp @@ -208,7 +208,7 @@ QQuickCanvasItemPrivate::~QQuickCanvasItemPrivate() /*! \qmltype Canvas \instantiates QQuickCanvasItem - \inqmlmodule QtQuick 2 + \inqmlmodule QtQuick \since 5.0 \inherits Item \ingroup qtquick-canvas diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp index 09036052dc..1930fb69c9 100644 --- a/src/quick/items/context2d/qquickcontext2d.cpp +++ b/src/quick/items/context2d/qquickcontext2d.cpp @@ -78,7 +78,7 @@ QT_BEGIN_NAMESPACE /*! \qmltype Context2D \instantiates QQuickContext2D - \inqmlmodule QtQuick 2 + \inqmlmodule QtQuick \ingroup qtquick-canvas \since 5.0 \brief Provides 2D context for shapes on a Canvas item @@ -2834,7 +2834,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_strokeText(QV4::SimpleCall /*! \qmltype TextMetrics - \inqmlmodule QtQuick 2 + \inqmlmodule QtQuick \since 5.0 \ingroup qtquick-canvas \brief Provides a Context2D TextMetrics interface @@ -3047,7 +3047,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_drawImage(QV4::SimpleCallC // pixel manipulation /*! \qmltype CanvasImageData - \inqmlmodule QtQuick 2 + \inqmlmodule QtQuick \ingroup qtquick-canvas \brief Contains image pixel data in RGBA order @@ -3111,7 +3111,7 @@ QV4::ReturnedValue QQuickJSContext2DImageData::method_get_data(QV4::SimpleCallCo /*! \qmltype CanvasPixelArray - \inqmlmodule QtQuick 2 + \inqmlmodule QtQuick \ingroup qtquick-canvas \brief Provides ordered and indexed access to the components of each pixel in image data @@ -3375,7 +3375,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_putImageData(QV4::SimpleCa /*! \qmltype CanvasGradient - \inqmlmodule QtQuick 2 + \inqmlmodule QtQuick \since 5.0 \ingroup qtquick-canvas \brief Provides an opaque CanvasGradient interface |