1 files changed, 8 insertions, 15 deletions
diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp
index a7c63c9df1..6cb316ce9f 100644
--- a/src/qml/qml/v8/qv8engine.cpp
+++ b/src/qml/qml/v8/qv8engine.cpp
@@ -61,7 +61,7 @@
 #include <QtCore/qdatastream.h>
 #include <private/qsimd_p.h>
 
-#include <private/qv4value_inl_p.h>
+#include <private/qv4value_p.h>
 #include <private/qv4dateobject_p.h>
 #include <private/qv4objectiterator_p.h>
 #include <private/qv4mm_p.h>
@@ -171,15 +171,10 @@ const QSet<QString> &QV8Engine::illegalNames() const
     return m_illegalNames;
 }
 
-QQmlContextData *QV8Engine::callingContext()
-{
-    return QV4::QmlContextWrapper::callingContext(m_v4Engine);
-}
-
 void QV8Engine::initializeGlobal()
 {
     QV4::Scope scope(m_v4Engine);
-    QV4::GlobalExtensions::init(m_engine, m_v4Engine->globalObject());
+    QV4::GlobalExtensions::init(m_engine, m_v4Engine->globalObject);
 
     QQmlLocale::registerStringLocaleCompare(m_v4Engine);
     QQmlDateExtension::registerExtension(m_v4Engine);
@@ -191,9 +186,9 @@ void QV8Engine::initializeGlobal()
     qt_add_sqlexceptions(m_v4Engine);
 
     {
-        for (uint i = 0; i < m_v4Engine->globalObject()->internalClass()->size; ++i) {
-            if (m_v4Engine->globalObject()->internalClass()->nameMap.at(i))
-                m_illegalNames.insert(m_v4Engine->globalObject()->internalClass()->nameMap.at(i)->string);
+        for (uint i = 0; i < m_v4Engine->globalObject->internalClass()->size; ++i) {
+            if (m_v4Engine->globalObject->internalClass()->nameMap.at(i))
+                m_illegalNames.insert(m_v4Engine->globalObject->internalClass()->nameMap.at(i)->string);
         }
     }
 
@@ -229,7 +224,7 @@ void QV8Engine::freezeObject(const QV4::Value &value)
     QV4::ScopedFunctionObject f(scope, m_freezeObject.value());
     QV4::ScopedCallData callData(scope, 1);
     callData->args[0] = value;
-    callData->thisObject = m_v4Engine->globalObject();
+    callData->thisObject = m_v4Engine->globalObject;
     f->call(callData);
 }
 
@@ -266,9 +261,7 @@ void QV8Engine::setExtensionData(int index, Deletable *data)
 void QV8Engine::initQmlGlobalObject()
 {
     initializeGlobal();
-    QV4::Scope scope(m_v4Engine);
-    QV4::ScopedValue v(scope, m_v4Engine->globalObject());
-    freezeObject(v);
+    freezeObject(*m_v4Engine->globalObject);
 }
 
 void QV8Engine::setEngine(QQmlEngine *engine)
@@ -279,7 +272,7 @@ void QV8Engine::setEngine(QQmlEngine *engine)
 
 QV4::ReturnedValue QV8Engine::global()
 {
-    return m_v4Engine->globalObject()->asReturnedValue();
+    return m_v4Engine->globalObject->asReturnedValue();
 }
 
 void QV8Engine::startTimer(const QString &timerName)