Fix API of QQmlV4Handle

Change-Id: Iac4a3fefebd33a5990408598486231a5add8e639
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

4 files changed, 7 insertions, 7 deletions

diff --git a/src/quick/items/context2d/qquickcanvascontext_p.h b/src/quick/items/context2d/qquickcanvascontext_p.h
index 2e3044008e..5c3359a2a9 100644
--- a/src/quick/items/context2d/qquickcanvascontext_p.h
+++ b/src/quick/items/context2d/qquickcanvascontext_p.h
@@ -69,7 +69,7 @@ public:
     virtual void flush();
 
     virtual void setV8Engine(QV8Engine *engine) = 0;
-    virtual QV4::Value v4value() const = 0;
+    virtual QV4::ReturnedValue v4value() const = 0;
 
     virtual QSGDynamicTexture *texture() const = 0;
 
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());
 }
diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp
index ea3bd77509..4b6f074354 100644
--- a/src/quick/items/context2d/qquickcontext2d.cpp
+++ b/src/quick/items/context2d/qquickcontext2d.cpp
@@ -4044,9 +4044,9 @@ QQuickContext2D::~QQuickContext2D()
     m_texture->deleteLater();
 }
 
-QV4::Value QQuickContext2D::v4value() const
+QV4::ReturnedValue QQuickContext2D::v4value() const
 {
-    return QV4::Value::fromReturnedValue(m_v4value.value());
+    return m_v4value.value();
 }
 
 QStringList QQuickContext2D::contextNames() const
diff --git a/src/quick/items/context2d/qquickcontext2d_p.h b/src/quick/items/context2d/qquickcontext2d_p.h
index 8164108bd3..0d5926a27f 100644
--- a/src/quick/items/context2d/qquickcontext2d_p.h
+++ b/src/quick/items/context2d/qquickcontext2d_p.h
@@ -175,7 +175,7 @@ public:
     QSGDynamicTexture *texture() const;
     QImage toImage(const QRectF& bounds);
 
-    QV4::Value v4value() const;
+    QV4::ReturnedValue v4value() const;
     void setV8Engine(QV8Engine *eng);
 
     QQuickCanvasItem* canvas() const { return m_canvas; }