aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/context2d
diff options
context:
space:
mode:
Diffstat (limited to 'src/quick/items/context2d')
-rw-r--r--src/quick/items/context2d/qquickcanvasitem.cpp10
-rw-r--r--src/quick/items/context2d/qquickcontext2d.cpp24
2 files changed, 17 insertions, 17 deletions
diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp
index 16f08d3a3a..b7de41cae8 100644
--- a/src/quick/items/context2d/qquickcanvasitem.cpp
+++ b/src/quick/items/context2d/qquickcanvasitem.cpp
@@ -415,7 +415,7 @@ void QQuickCanvasItem::setCanvasSize(const QSizeF & size)
By default the tileSize is the same as the canvasSize.
- \sa QtQuick2::Canvas::canvaasSize, QtQuick2::Canvas::canvasWindow
+ \sa QtQuick2::Canvas::canvasSize, QtQuick2::Canvas::canvasWindow
*/
QSize QQuickCanvasItem::tileSize() const
{
@@ -873,8 +873,8 @@ QQmlRefPointer<QQuickCanvasPixmap> QQuickCanvasItem::loadedPixmap(const QUrl& ur
The loaded image can be unloaded by the \a QtQuick2::Canvas::unloadImage method.
Note: Only loaded images can be painted on the Canvas item.
- \sa QtQuick2::Canvas::unloadImage, QtQuick2::Canvas::imageLoaded, QtQuick2::Canvas::isImageLoaded,
- QtQuick2::Context2D::createImageData, QtQuick2::Context2D::drawImage
+ \sa QtQuick2::Canvas::unloadImage, QtQuick2::Canvas::onImageLoaded, QtQuick2::Canvas::isImageLoaded,
+ QtQuick2::Context2D::createImageData(), QtQuick2::Context2D::drawImage
*/
void QQuickCanvasItem::loadImage(const QUrl& url)
{
@@ -900,8 +900,8 @@ void QQuickCanvasItem::loadImage(const QUrl& url)
Once an image is unloaded it cannot be painted by the canvas context
unless it is loaded again.
- \sa QtQuick2::Canvas::loadImage, QtQuick2::Canvas::imageLoaded, QtQuick2::Canvas::isImageLoaded,
- QtQuick2::Context2D::createImageData, QtQuick2::Context2D::drawImage
+ \sa QtQuick2::Canvas::loadImage, QtQuick2::Canvas::onImageLoaded, QtQuick2::Canvas::isImageLoaded,
+ QtQuick2::Context2D::createImageData(), QtQuick2::Context2D::drawImage
*/
void QQuickCanvasItem::unloadImage(const QUrl& url)
{
diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp
index d940a0ba58..3b75229f7a 100644
--- a/src/quick/items/context2d/qquickcontext2d.cpp
+++ b/src/quick/items/context2d/qquickcontext2d.cpp
@@ -818,7 +818,7 @@ static void ctx2d_globalCompositeOperation_set(v8::Local<v8::String>, v8::Local<
The default value is '#000000'.
\sa QtQuick2::Context2D::createLinearGradient
\sa QtQuick2::Context2D::createRadialGradient
- \sa QtQuick2::Context2D::createPattern
+ \sa QtQuick2::Context2D::createPattern()
\sa QtQuick2::Context2D::strokeStyle
*/
static v8::Handle<v8::Value> ctx2d_fillStyle(v8::Local<v8::String>, const v8::AccessorInfo &info)
@@ -923,7 +923,7 @@ static void ctx2d_fillRule_set(v8::Local<v8::String>, v8::Local<v8::Value> value
\sa QtQuick2::Context2D::createLinearGradient
\sa QtQuick2::Context2D::createRadialGradient
- \sa QtQuick2::Context2D::createPattern
+ \sa QtQuick2::Context2D::createPattern()
\sa QtQuick2::Context2D::fillStyle
*/
v8::Handle<v8::Value> ctx2d_strokeStyle(v8::Local<v8::String>, const v8::AccessorInfo &info)
@@ -992,8 +992,8 @@ static void ctx2d_strokeStyle_set(v8::Local<v8::String>, v8::Local<v8::Value> va
\sa QtQuick2::Context2D::CanvasGradient::addColorStop
\sa QtQuick2::Context2D::createRadialGradient
- \sa QtQuick2::Context2D::ctx2d_createConicalGradient
- \sa QtQuick2::Context2D::createPattern
+ \sa QtQuick2::Context2D::ctx2d_createConicalGradient()
+ \sa QtQuick2::Context2D::createPattern()
\sa QtQuick2::Context2D::fillStyle
\sa QtQuick2::Context2D::strokeStyle
*/
@@ -1038,8 +1038,8 @@ static v8::Handle<v8::Value> ctx2d_createLinearGradient(const v8::Arguments &arg
\sa QtQuick2::Context2D::CanvasGradient::addColorStop
\sa QtQuick2::Context2D::createLinearGradient
- \sa QtQuick2::Context2D::ctx2d_createConicalGradient
- \sa QtQuick2::Context2D::createPattern
+ \sa QtQuick2::Context2D::ctx2d_createConicalGradient()
+ \sa QtQuick2::Context2D::createPattern()
\sa QtQuick2::Context2D::fillStyle
\sa QtQuick2::Context2D::strokeStyle
*/
@@ -1093,8 +1093,8 @@ static v8::Handle<v8::Value> ctx2d_createRadialGradient(const v8::Arguments &arg
\sa QtQuick2::Context2D::CanvasGradient::addColorStop
\sa QtQuick2::Context2D::createLinearGradient
- \sa QtQuick2::Context2D::ctx2d_createRadialGradient
- \sa QtQuick2::Context2D::createPattern
+ \sa QtQuick2::Context2D::ctx2d_createRadialGradient()
+ \sa QtQuick2::Context2D::createPattern()
\sa QtQuick2::Context2D::fillStyle
\sa QtQuick2::Context2D::strokeStyle
*/
@@ -2256,7 +2256,7 @@ static v8::Handle<v8::Value> ctx2d_measureText(const v8::Arguments &args)
\sa QtQuick2::Image
\sa QtQuick2::Canvas::loadImage
\sa QtQuick2::Canvas::isImageLoaded
- \sa QtQuick2::Canvas::imageLoaded
+ \sa QtQuick2::Canvas::onImageLoaded
\sa {http://www.w3.org/TR/2dcontext/#dom-context-2d-drawimage}{W3C 2d context standard for drawImage}
*/
@@ -2276,7 +2276,7 @@ static v8::Handle<v8::Value> ctx2d_measureText(const v8::Arguments &args)
\sa QtQuick2::Image
\sa QtQuick2::Canvas::loadImage
\sa QtQuick2::Canvas::isImageLoaded
- \sa QtQuick2::Canvas::imageLoaded
+ \sa QtQuick2::Canvas::onImageLoaded
\sa {http://www.w3.org/TR/2dcontext/#dom-context-2d-drawimage}{W3C 2d context standard for drawImage}
*/
@@ -2297,7 +2297,7 @@ static v8::Handle<v8::Value> ctx2d_measureText(const v8::Arguments &args)
\sa QtQuick2::Image
\sa QtQuick2::Canvas::loadImage
\sa QtQuick2::Canvas::isImageLoaded
- \sa QtQuick2::Canvas::imageLoaded
+ \sa QtQuick2::Canvas::onImageLoaded
\sa {http://www.w3.org/TR/2dcontext/#dom-context-2d-drawimage}{W3C 2d context standard for drawImage}
*/
@@ -2419,7 +2419,7 @@ static v8::Handle<v8::Value> ctx2d_drawImage(const v8::Arguments &args)
\sa QtQuick2::CanvasImageData::width
\sa QtQuick2::CanvasImageData::height
\sa QtQuick2::CanvasImageData::data
- \sa QtQuick2::Context2D::createImageData
+ \sa QtQuick2::Context2D::createImageData()
\sa QtQuick2::Context2D::getImageData
\sa QtQuick2::Context2D::putImageData
*/