diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-04-19 10:59:41 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-04-19 13:07:10 +0200 |
| commit | 3e08aa42497f7d264be039f31f4eedf639eda307 (patch) | |
| tree | 871ee4f38715ab0111fe8e2c49756ca60390898e /src/quick/items/context2d | |
| parent | 190b376859ae9709e887886fcbaa56d60495be66 (diff) | |
Rename QQmlV8Handle to QQmlV4Handle
The handle wraps a V4 Value, so this is the better name for it.
Also added some accessor methods to convert to and from V4
Values.
Change-Id: I327c83feb5bd3be59909001489979e5a3a9d9e67
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/quick/items/context2d')
| -rw-r--r-- | src/quick/items/context2d/qquickcanvasitem.cpp | 6 | ||||
| -rw-r--r-- | src/quick/items/context2d/qquickcanvasitem_p.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp index 4650488705..531fac825d 100644 --- a/src/quick/items/context2d/qquickcanvasitem.cpp +++ b/src/quick/items/context2d/qquickcanvasitem.cpp @@ -362,13 +362,13 @@ void QQuickCanvasItem::setContextType(const QString &contextType) this property will contain the current drawing context, otherwise null. */ -QQmlV8Handle QQuickCanvasItem::context() const +QQmlV4Handle QQuickCanvasItem::context() const { Q_D(const QQuickCanvasItem); if (d->contextInitialized) - return QQmlV8Handle::fromHandle(d->context->v8value()); + return QQmlV4Handle::fromV8Handle(d->context->v8value()); - return QQmlV8Handle::fromHandle(v8::Null()); + return QQmlV4Handle::fromV8Handle(v8::Null()); } /*! diff --git a/src/quick/items/context2d/qquickcanvasitem_p.h b/src/quick/items/context2d/qquickcanvasitem_p.h index c53e4f952a..09c3802563 100644 --- a/src/quick/items/context2d/qquickcanvasitem_p.h +++ b/src/quick/items/context2d/qquickcanvasitem_p.h @@ -85,7 +85,7 @@ class QQuickCanvasItem : public QQuickItem Q_PROPERTY(bool available READ isAvailable NOTIFY availableChanged) Q_PROPERTY(QString contextType READ contextType WRITE setContextType NOTIFY contextTypeChanged) - Q_PROPERTY(QQmlV8Handle context READ context NOTIFY contextChanged) + Q_PROPERTY(QQmlV4Handle context READ context NOTIFY contextChanged) Q_PROPERTY(QSizeF canvasSize READ canvasSize WRITE setCanvasSize NOTIFY canvasSizeChanged) Q_PROPERTY(QSize tileSize READ tileSize WRITE setTileSize NOTIFY tileSizeChanged) Q_PROPERTY(QRectF canvasWindow READ canvasWindow WRITE setCanvasWindow NOTIFY canvasWindowChanged) @@ -112,7 +112,7 @@ public: QString contextType() const; void setContextType(const QString &contextType); - QQmlV8Handle context() const; + QQmlV4Handle context() const; QSizeF canvasSize() const; void setCanvasSize(const QSizeF &); |