diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-06-25 10:16:26 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-06-25 10:16:26 +0000 |
| commit | 8597f74e520c18e0ac1c7a90e02a3b5ba33d4753 (patch) | |
| tree | 8ec478d8726deddb0b9891dbeecc92850c5e6999 /src/quick/items/context2d/qquickcontext2d.cpp | |
| parent | 0b0ff6e8cdb5d59983ae44a1d475eee11dd531c4 (diff) | |
| parent | fbf6f7400a5b5ae10267171e201391ce1ff8eb96 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev
Diffstat (limited to 'src/quick/items/context2d/qquickcontext2d.cpp')
| -rw-r--r-- | src/quick/items/context2d/qquickcontext2d.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp index 314b7904b4..0ce62952d7 100644 --- a/src/quick/items/context2d/qquickcontext2d.cpp +++ b/src/quick/items/context2d/qquickcontext2d.cpp @@ -95,7 +95,7 @@ QT_BEGIN_NAMESPACE \inqmlmodule QtQuick \ingroup qtquick-canvas \since 5.0 - \brief Provides 2D context for shapes on a Canvas item + \brief Provides 2D context for shapes on a Canvas item. The Context2D object can be created by \c Canvas item's \c getContext() method: @@ -3044,7 +3044,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_drawImage(const QV4::Funct \qmltype CanvasImageData \inqmlmodule QtQuick \ingroup qtquick-canvas - \brief Contains image pixel data in RGBA order + \brief Contains image pixel data in RGBA order. The CanvasImageData object holds the image pixel data. @@ -3106,7 +3106,7 @@ QV4::ReturnedValue QQuickJSContext2DImageData::method_get_data(const QV4::Functi \qmltype CanvasPixelArray \inqmlmodule QtQuick \ingroup qtquick-canvas - \brief Provides ordered and indexed access to the components of each pixel in image data + \brief Provides ordered and indexed access to the components of each pixel in image data. The CanvasPixelArray object provides ordered, indexed access to the color components of each pixel of the image data. The CanvasPixelArray can be accessed as normal Javascript array. @@ -3372,7 +3372,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_putImageData(const QV4::Fu \inqmlmodule QtQuick \since 5.0 \ingroup qtquick-canvas - \brief Provides an opaque CanvasGradient interface + \brief Provides an opaque CanvasGradient interface. */ /*! |