Merge remote-tracking branch 'gerrit/5.11' into wip/webassembly

Change-Id: I729af792166fd2f6c5843ba564e63adf8ae09a97

1 files changed, 5 insertions, 17 deletions

diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp
index 624e222241..bdb066267a 100644
--- a/src/qml/qml/v8/qv8engine.cpp
+++ b/src/qml/qml/v8/qv8engine.cpp
@@ -123,11 +123,11 @@ static void restoreJSValue(QDataStream &stream, void *data)
     }
 }
 
-QV8Engine::QV8Engine(QJSEngine* qq)
+QV8Engine::QV8Engine(QJSEngine *qq, QV4::ExecutionEngine *v4)
     : q(qq)
-    , m_engine(0)
-    , m_xmlHttpRequestData(0)
-    , m_listModelData(0)
+    , m_engine(nullptr)
+    , m_v4Engine(v4)
+    , m_xmlHttpRequestData(nullptr)
 {
 #ifndef Q_OS_HTML5
 #ifdef Q_PROCESSOR_X86_32
@@ -149,8 +149,6 @@ QV8Engine::QV8Engine(QJSEngine* qq)
         QMetaType::registerConverter<QJSValue, QStringList>(convertJSValueToVariantType<QStringList>);
     QMetaType::registerStreamOperators(qMetaTypeId<QJSValue>(), saveJSValue, restoreJSValue);
 
-    m_v4Engine = new QV4::ExecutionEngine;
-    m_v4Engine->v8Engine = this;
     m_delayedCallQueue.init(m_v4Engine);
 
     QV4::QObjectWrapper::initializeBindings(m_v4Engine);
@@ -163,13 +161,8 @@ QV8Engine::~QV8Engine()
 
 #if QT_CONFIG(xmlstreamreader) && QT_CONFIG(qml_network)
     qt_rem_qmlxmlhttprequest(m_v4Engine, m_xmlHttpRequestData);
-    m_xmlHttpRequestData = 0;
+    m_xmlHttpRequestData = nullptr;
 #endif
-
-    delete m_listModelData;
-    m_listModelData = 0;
-
-    delete m_v4Engine;
 }
 
 #if QT_CONFIG(qml_network)
@@ -294,11 +287,6 @@ void QV8Engine::setEngine(QQmlEngine *engine)
     initQmlGlobalObject();
 }
 
-QV4::ReturnedValue QV8Engine::global()
-{
-    return m_v4Engine->globalObject->asReturnedValue();
-}
-
 void QV8Engine::startTimer(const QString &timerName)
 {
     if (!m_time.isValid())