diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-24 12:13:42 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-26 09:05:19 +0200 |
| commit | a57085f00b146798a0cca0d52dfa127232c3e659 (patch) | |
| tree | 7b4df3f155d431aeb6f3aae01943a3411c812a7b /src/quick/items/context2d/qquickcanvasitem.cpp | |
| parent | 12fd2ccd3fa2dc0133b5a3fb89f9fdf5cf721232 (diff) | |
Fix API of QQmlV4Handle
Change-Id: Iac4a3fefebd33a5990408598486231a5add8e639
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/quick/items/context2d/qquickcanvasitem.cpp')
| -rw-r--r-- | src/quick/items/context2d/qquickcanvasitem.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp index 78369eb404..50a5431740 100644 --- a/src/quick/items/context2d/qquickcanvasitem.cpp +++ b/src/quick/items/context2d/qquickcanvasitem.cpp @@ -370,7 +370,7 @@ QQmlV4Handle QQuickCanvasItem::context() const if (d->context) return QQmlV4Handle(d->context->v4value()); - return QQmlV4Handle(QV4::Value::nullValue()); + return QQmlV4Handle(QV4::Encode::null()); } /*! @@ -755,7 +755,7 @@ void QQuickCanvasItem::getContext(QQmlV4Function *args) if (d->context != 0) { if (d->context->contextNames().contains(contextId, Qt::CaseInsensitive)) { - args->setReturnValue(d->context->v4value()); + args->setReturnValue(QV4::Value::fromReturnedValue(d->context->v4value())); return; } @@ -765,7 +765,7 @@ void QQuickCanvasItem::getContext(QQmlV4Function *args) } if (createContext(contextId)) - args->setReturnValue(d->context->v4value()); + args->setReturnValue(QV4::Value::fromReturnedValue(d->context->v4value())); else args->setReturnValue(QV4::Value::nullValue()); } |