Remove QQmlV4Handle

This is just an alias for QV4::ReturnedValue. We can as well use the
latter.

Change-Id: Ibd2c038a3ca726b39a8f0f05e02922adb9fccbdb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

5 files changed, 13 insertions, 11 deletions

diff --git a/src/quick/items/context2d/qquickcanvascontext_p.h b/src/quick/items/context2d/qquickcanvascontext_p.h
index 95100d2912..3872a2ac74 100644
--- a/src/quick/items/context2d/qquickcanvascontext_p.h
+++ b/src/quick/items/context2d/qquickcanvascontext_p.h
@@ -56,7 +56,7 @@
 QT_REQUIRE_CONFIG(quick_canvas);
 
 #include <QtQuick/qquickitem.h>
-#include <private/qv8engine_p.h>
+#include <QtQml/private/qv4value_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -80,6 +80,7 @@ public:
     virtual void prepare(const QSize& canvasSize, const QSize& tileSize, const QRect& canvasWindow, const QRect& dirtyRect, bool smooth, bool antialiasing);
     virtual void flush();
 
+    virtual QV4::ExecutionEngine *v4Engine() const = 0;
     virtual void setV4Engine(QV4::ExecutionEngine *engine) = 0;
     virtual QV4::ReturnedValue v4value() const = 0;
 
diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp
index 14443a2f2f..188e74cd89 100644
--- a/src/quick/items/context2d/qquickcanvasitem.cpp
+++ b/src/quick/items/context2d/qquickcanvasitem.cpp
@@ -378,13 +378,10 @@ void QQuickCanvasItem::setContextType(const QString &contextType)
     this property will contain the current drawing context, otherwise null.
 */
 
-QQmlV4Handle QQuickCanvasItem::context() const
+QJSValue QQuickCanvasItem::context() const
 {
     Q_D(const QQuickCanvasItem);
-    if (d->context)
-        return QQmlV4Handle(d->context->v4value());
-
-    return QQmlV4Handle(QV4::Encode::null());
+    return d->context ? QJSValue(d->context->v4Engine(), d->context->v4value()) : QJSValue();
 }
 
 /*!
diff --git a/src/quick/items/context2d/qquickcanvasitem_p.h b/src/quick/items/context2d/qquickcanvasitem_p.h
index 7dc981a6eb..cd2977429b 100644
--- a/src/quick/items/context2d/qquickcanvasitem_p.h
+++ b/src/quick/items/context2d/qquickcanvasitem_p.h
@@ -56,9 +56,9 @@
 QT_REQUIRE_CONFIG(quick_canvas);
 
 #include <QtQuick/qquickitem.h>
-#include <private/qv8engine_p.h>
 #include <private/qqmlrefcount_p.h>
 #include <QtCore/QThread>
+#include <QtCore/qmutex.h>
 #include <QtGui/QImage>
 
 QT_BEGIN_NAMESPACE
@@ -93,7 +93,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(QQmlV4Handle context READ context NOTIFY contextChanged)
+    Q_PROPERTY(QJSValue 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)
@@ -122,7 +122,7 @@ public:
     QString contextType() const;
     void setContextType(const QString &contextType);
 
-    QQmlV4Handle context() const;
+    QJSValue context() const;
 
     QSizeF canvasSize() const;
     void setCanvasSize(const QSizeF &);
diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp
index 546f3011ec..58bc12a221 100644
--- a/src/quick/items/context2d/qquickcontext2d.cpp
+++ b/src/quick/items/context2d/qquickcontext2d.cpp
@@ -56,7 +56,6 @@
 #include <private/qquickimage_p_p.h>
 
 #include <qqmlinfo.h>
-#include <private/qv8engine_p.h>
 
 #include <qqmlengine.h>
 #include <private/qv4domerrors_p.h>
@@ -4552,6 +4551,11 @@ void QQuickContext2D::reset()
     m_buffer->clearRect(QRectF(0, 0, m_canvas->width(), m_canvas->height()));
 }
 
+QV4::ExecutionEngine *QQuickContext2D::v4Engine() const
+{
+    return m_v4engine;
+}
+
 void QQuickContext2D::setV4Engine(QV4::ExecutionEngine *engine)
 {
     if (m_v4engine != engine) {
diff --git a/src/quick/items/context2d/qquickcontext2d_p.h b/src/quick/items/context2d/qquickcontext2d_p.h
index 1ece6796f3..b5626dec0c 100644
--- a/src/quick/items/context2d/qquickcontext2d_p.h
+++ b/src/quick/items/context2d/qquickcontext2d_p.h
@@ -65,7 +65,6 @@ QT_REQUIRE_CONFIG(quick_canvas);
 #include <QtCore/qstring.h>
 #include <QtCore/qstack.h>
 #include <QtCore/qqueue.h>
-#include <private/qv8engine_p.h>
 #include <QtCore/QWaitCondition>
 
 #include <private/qv4value_p.h>
@@ -199,6 +198,7 @@ public:
     QImage toImage(const QRectF& bounds) override;
 
     QV4::ReturnedValue v4value() const override;
+    QV4::ExecutionEngine *v4Engine() const override;
     void setV4Engine(QV4::ExecutionEngine *eng) override;
 
     QQuickCanvasItem* canvas() const { return m_canvas; }