diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2018-06-25 09:53:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-06-25 12:15:55 +0200 |
| commit | fbf6f7400a5b5ae10267171e201391ce1ff8eb96 (patch) | |
| tree | 18e22092c2764fea16442fd814f230d4fe095a49 /src/quick/items/context2d/qquickcontext2d.cpp | |
| parent | c21a6a9f2c2d635aca3bf88a6431c560b16b1cc6 (diff) | |
| parent | 9999591e69a0908cd3fbe14646fb98881e32061b (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/plugins/qmltooling/packetprotocol/qpacketprotocol.cpp
src/quick/handlers/qquickhandlerpoint.cpp
src/quick/handlers/qquicksinglepointhandler.cpp
tests/auto/qml/ecmascripttests/test262
Change-Id: I8908ec8c6116ca626fbd269af7625d4c429429ca
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 07d5f6d39b..ef6f5fa716 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. */ /*! |