aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2012-08-01 14:13:53 +1000
committerQt by Nokia <qt-info@nokia.com>2012-08-02 05:44:49 +0200
commit7b75e27e485bacf48bdead1e404144410879e987 (patch)
tree3c194175fae3db7536ce849784d09fb0d15b6304
parente3a410898e8c9b4e5bebb2b149442092ac863f52 (diff)
Add missing types for canvas related properties
Change-Id: I208c5889be2768673637882e58f43f43ed1f28d9 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
-rw-r--r--src/quick/items/context2d/qquickcontext2d.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp
index 40a9b8e34c..d940a0ba58 100644
--- a/src/quick/items/context2d/qquickcontext2d.cpp
+++ b/src/quick/items/context2d/qquickcontext2d.cpp
@@ -2424,7 +2424,7 @@ static v8::Handle<v8::Value> ctx2d_drawImage(const v8::Arguments &args)
\sa QtQuick2::Context2D::putImageData
*/
/*!
- \qmlproperty QtQuick2::CanvasImageData::width
+ \qmlproperty int QtQuick2::CanvasImageData::width
Holds the actual width dimension of the data in the ImageData object, in device pixels.
*/
v8::Handle<v8::Value> ctx2d_imageData_width(v8::Local<v8::String>, const v8::AccessorInfo &args)
@@ -2436,7 +2436,7 @@ v8::Handle<v8::Value> ctx2d_imageData_width(v8::Local<v8::String>, const v8::Acc
}
/*!
- \qmlproperty QtQuick2::CanvasImageData::height
+ \qmlproperty int QtQuick2::CanvasImageData::height
Holds the actual height dimension of the data in the ImageData object, in device pixels.
*/
v8::Handle<v8::Value> ctx2d_imageData_height(v8::Local<v8::String>, const v8::AccessorInfo &args)
@@ -2449,7 +2449,7 @@ v8::Handle<v8::Value> ctx2d_imageData_height(v8::Local<v8::String>, const v8::Ac
}
/*!
- \qmlproperty QtQuick2::CanvasImageData::data
+ \qmlproperty object QtQuick2::CanvasImageData::data
Holds the one-dimensional array containing the data in RGBA order, as integers in the range 0 to 255.
*/
v8::Handle<v8::Value> ctx2d_imageData_data(v8::Local<v8::String>, const v8::AccessorInfo &args)
@@ -2470,7 +2470,7 @@ v8::Handle<v8::Value> ctx2d_imageData_data(v8::Local<v8::String>, const v8::Acce
*/
/*!
- \qmlproperty QtQuick2::CanvasPixelArray::length
+ \qmlproperty int QtQuick2::CanvasPixelArray::length
The CanvasPixelArray object represents h×w×4 integers which w and h comes from CanvasImageData.
The length attribute of a CanvasPixelArray object must return this h×w×4 number value.
This property is read only.