Start cleaning up the QmlContextWrapper

The class should get merged with the QV4::QmlContext class.
Simplify the cleanup by moving both classes into a common
file.

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

13 files changed, 4 insertions, 444 deletions

diff --git a/src/qml/qml/qml.pri b/src/qml/qml/qml.pri
index 8d8da3742d..412dc6cba2 100644
--- a/src/qml/qml/qml.pri
+++ b/src/qml/qml/qml.pri
@@ -42,7 +42,6 @@ SOURCES += \
     $$PWD/qqmlabstracturlinterceptor.cpp \
     $$PWD/qqmlapplicationengine.cpp \
     $$PWD/qqmllistwrapper.cpp \
-    $$PWD/qqmlcontextwrapper.cpp \
     $$PWD/qqmlvaluetypewrapper.cpp \
     $$PWD/qqmltypewrapper.cpp \
     $$PWD/qqmlfileselector.cpp \
@@ -113,8 +112,6 @@ HEADERS += \
     $$PWD/qqmlapplicationengine_p.h \
     $$PWD/qqmlapplicationengine.h \
     $$PWD/qqmllistwrapper_p.h \
-    $$PWD/qqmlcontextwrapper_p.h \
-    $$PWD/qqmlvaluetypewrapper_p.h \
     $$PWD/qqmltypewrapper_p.h \
     $$PWD/qqmlfileselector_p.h \
     $$PWD/qqmlfileselector.h \
diff --git a/src/qml/qml/qqmlbinding.cpp b/src/qml/qml/qqmlbinding.cpp
index 203bfec838..c150b1ee29 100644
--- a/src/qml/qml/qqmlbinding.cpp
+++ b/src/qml/qml/qqmlbinding.cpp
@@ -46,7 +46,6 @@
 #include <private/qqmlprofiler_p.h>
 #include <private/qqmlexpression_p.h>
 #include <private/qqmlscriptstring_p.h>
-#include <private/qqmlcontextwrapper_p.h>
 #include <private/qqmlbuiltinfunctions_p.h>
 #include <private/qqmlvmemetaobject_p.h>
 #include <private/qqmlvaluetypewrapper_p.h>
diff --git a/src/qml/qml/qqmlcontextwrapper.cpp b/src/qml/qml/qqmlcontextwrapper.cpp
deleted file mode 100644
index 2418003519..0000000000
--- a/src/qml/qml/qqmlcontextwrapper.cpp
+++ /dev/null
@@ -1,323 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qqmlcontextwrapper_p.h"
-#include <private/qv8engine_p.h>
-
-#include <private/qqmlengine_p.h>
-#include <private/qqmlcontext_p.h>
-
-#include <private/qv4engine_p.h>
-#include <private/qv4value_p.h>
-#include <private/qv4objectproto_p.h>
-#include <private/qv4mm_p.h>
-#include <private/qv4function_p.h>
-#include <private/qv4compileddata_p.h>
-#include <private/qqmltypewrapper_p.h>
-#include <private/qqmllistwrapper_p.h>
-#include <private/qqmljavascriptexpression_p.h>
-#include <private/qjsvalue_p.h>
-#include <private/qv4qobjectwrapper_p.h>
-
-QT_BEGIN_NAMESPACE
-
-using namespace QV4;
-
-DEFINE_OBJECT_VTABLE(QmlContextWrapper);
-
-void Heap::QmlContextWrapper::init(QQmlContextData *context, QObject *scopeObject, bool ownsContext)
-{
-    Object::init();
-    readOnly = true;
-    this->ownsContext = ownsContext;
-    isNullWrapper = false;
-    this->context = new QQmlGuardedContextData(context);
-    this->scopeObject.init(scopeObject);
-}
-
-void Heap::QmlContextWrapper::destroy()
-{
-    if (*context && ownsContext)
-        (*context)->destroy();
-    delete context;
-    scopeObject.destroy();
-    Object::destroy();
-}
-
-ReturnedValue QmlContextWrapper::qmlScope(ExecutionEngine *v4, QQmlContextData *ctxt, QObject *scope)
-{
-    Scope valueScope(v4);
-
-    Scoped<QmlContextWrapper> w(valueScope, v4->memoryManager->allocObject<QmlContextWrapper>(ctxt, scope));
-    return w.asReturnedValue();
-}
-
-ReturnedValue QmlContextWrapper::urlScope(ExecutionEngine *v4, const QUrl &url)
-{
-    Scope scope(v4);
-
-    QQmlContextData *context = new QQmlContextData;
-    context->baseUrl = url;
-    context->baseUrlString = url.toString();
-    context->isInternal = true;
-    context->isJSContext = true;
-
-    Scoped<QmlContextWrapper> w(scope, v4->memoryManager->allocObject<QmlContextWrapper>(context, (QObject*)0, true));
-    w->d()->isNullWrapper = true;
-    return w.asReturnedValue();
-}
-
-ReturnedValue QmlContextWrapper::get(const Managed *m, String *name, bool *hasProperty)
-{
-    Q_ASSERT(m->as<QmlContextWrapper>());
-    const QmlContextWrapper *resource = static_cast<const QmlContextWrapper *>(m);
-    QV4::ExecutionEngine *v4 = resource->engine();
-    QV4::Scope scope(v4);
-
-    // In V8 the JS global object would come _before_ the QML global object,
-    // so simulate that here.
-    bool hasProp;
-    QV4::ScopedValue result(scope, v4->globalObject->get(name, &hasProp));
-    if (hasProp) {
-        if (hasProperty)
-            *hasProperty = hasProp;
-        return result->asReturnedValue();
-    }
-
-    if (resource->d()->isNullWrapper)
-        return Object::get(m, name, hasProperty);
-
-    if (v4->callingQmlContext() != *resource->d()->context)
-        return Object::get(m, name, hasProperty);
-
-    result = Object::get(m, name, &hasProp);
-    if (hasProp) {
-        if (hasProperty)
-            *hasProperty = hasProp;
-        return result->asReturnedValue();
-    }
-
-    // Its possible we could delay the calculation of the "actual" context (in the case
-    // of sub contexts) until it is definately needed.
-    QQmlContextData *context = resource->getContext();
-    QQmlContextData *expressionContext = context;
-
-    if (!context) {
-        if (hasProperty)
-            *hasProperty = true;
-        return result->asReturnedValue();
-    }
-
-    // Search type (attached property/enum/imported scripts) names
-    // while (context) {
-    //     Search context properties
-    //     Search scope object
-    //     Search context object
-    //     context = context->parent
-    // }
-
-    QObject *scopeObject = resource->getScopeObject();
-
-    if (context->imports && name->startsWithUpper()) {
-        // Search for attached properties, enums and imported scripts
-        QQmlTypeNameCache::Result r = context->imports->query(name);
-
-        if (r.isValid()) {
-            if (hasProperty)
-                *hasProperty = true;
-            if (r.scriptIndex != -1) {
-                QV4::ScopedObject scripts(scope, context->importedScripts.valueRef());
-                return scripts->getIndexed(r.scriptIndex);
-            } else if (r.type) {
-                return QmlTypeWrapper::create(v4, scopeObject, r.type);
-            } else if (r.importNamespace) {
-                return QmlTypeWrapper::create(v4, scopeObject, context->imports, r.importNamespace);
-            }
-            Q_ASSERT(!"Unreachable");
-        }
-
-        // Fall through
-    }
-
-    QQmlEnginePrivate *ep = QQmlEnginePrivate::get(v4->qmlEngine());
-
-    while (context) {
-        // Search context properties
-        const QV4::IdentifierHash<int> &properties = context->propertyNames();
-        if (properties.count()) {
-            int propertyIdx = properties.value(name);
-
-            if (propertyIdx != -1) {
-
-                if (propertyIdx < context->idValueCount) {
-
-                    if (ep->propertyCapture)
-                        ep->propertyCapture->captureProperty(&context->idValues[propertyIdx].bindings);
-                    if (hasProperty)
-                        *hasProperty = true;
-                    return QV4::QObjectWrapper::wrap(v4, context->idValues[propertyIdx]);
-                } else {
-
-                    QQmlContextPrivate *cp = context->asQQmlContextPrivate();
-
-                    if (ep->propertyCapture)
-                        ep->propertyCapture->captureProperty(context->asQQmlContext(), -1, propertyIdx + cp->notifyIndex);
-
-                    const QVariant &value = cp->propertyValues.at(propertyIdx);
-                    if (hasProperty)
-                        *hasProperty = true;
-                    if (value.userType() == qMetaTypeId<QList<QObject*> >()) {
-                        QQmlListProperty<QObject> prop(context->asQQmlContext(), (void*) qintptr(propertyIdx),
-                                                               QQmlContextPrivate::context_count,
-                                                               QQmlContextPrivate::context_at);
-                        return QmlListWrapper::create(v4, prop, qMetaTypeId<QQmlListProperty<QObject> >());
-                    } else {
-                        return scope.engine->fromVariant(cp->propertyValues.at(propertyIdx));
-                    }
-                }
-            }
-        }
-
-        // Search scope object
-        if (scopeObject) {
-            bool hasProp = false;
-            QV4::ScopedValue result(scope, QV4::QObjectWrapper::getQmlProperty(v4, context, scopeObject,
-                                                                               name, QV4::QObjectWrapper::CheckRevision, &hasProp));
-            if (hasProp) {
-                if (hasProperty)
-                    *hasProperty = true;
-                return result->asReturnedValue();
-            }
-        }
-        scopeObject = 0;
-
-
-        // Search context object
-        if (context->contextObject) {
-            bool hasProp = false;
-            result = QV4::QObjectWrapper::getQmlProperty(v4, context, context->contextObject, name, QV4::QObjectWrapper::CheckRevision, &hasProp);
-            if (hasProp) {
-                if (hasProperty)
-                    *hasProperty = true;
-                return result->asReturnedValue();
-            }
-        }
-
-        context = context->parent;
-    }
-
-    expressionContext->unresolvedNames = true;
-
-    return Encode::undefined();
-}
-
-void QmlContextWrapper::put(Managed *m, String *name, const Value &value)
-{
-    Q_ASSERT(m->as<QmlContextWrapper>());
-    QmlContextWrapper *resource = static_cast<QmlContextWrapper *>(m);
-    ExecutionEngine *v4 = resource->engine();
-    QV4::Scope scope(v4);
-    if (scope.hasException())
-        return;
-    QV4::Scoped<QmlContextWrapper> wrapper(scope, resource);
-
-    uint member = wrapper->internalClass()->find(name);
-    if (member < UINT_MAX) {
-        wrapper->putValue(member, value);
-        return;
-    }
-
-    if (wrapper->d()->isNullWrapper) {
-        if (wrapper && wrapper->d()->readOnly) {
-            QString error = QLatin1String("Invalid write to global property \"") + name->toQString() +
-                            QLatin1Char('"');
-            ScopedString e(scope, v4->newString(error));
-            v4->throwError(e);
-            return;
-        }
-
-        Object::put(m, name, value);
-        return;
-    }
-
-    // Its possible we could delay the calculation of the "actual" context (in the case
-    // of sub contexts) until it is definately needed.
-    QQmlContextData *context = wrapper->getContext();
-    QQmlContextData *expressionContext = context;
-
-    if (!context)
-        return;
-
-    // See QV8ContextWrapper::Getter for resolution order
-
-    QObject *scopeObject = wrapper->getScopeObject();
-
-    while (context) {
-        const QV4::IdentifierHash<int> &properties = context->propertyNames();
-        // Search context properties
-        if (properties.count() && properties.value(name) != -1)
-            return;
-
-        // Search scope object
-        if (scopeObject &&
-            QV4::QObjectWrapper::setQmlProperty(v4, context, scopeObject, name, QV4::QObjectWrapper::CheckRevision, value))
-            return;
-        scopeObject = 0;
-
-        // Search context object
-        if (context->contextObject &&
-            QV4::QObjectWrapper::setQmlProperty(v4, context, context->contextObject, name, QV4::QObjectWrapper::CheckRevision, value))
-            return;
-
-        context = context->parent;
-    }
-
-    expressionContext->unresolvedNames = true;
-
-    if (wrapper->d()->readOnly) {
-        QString error = QLatin1String("Invalid write to global property \"") + name->toQString() +
-                        QLatin1Char('"');
-        v4->throwError(error);
-        return;
-    }
-
-    Object::put(m, name, value);
-}
-
-QT_END_NAMESPACE
diff --git a/src/qml/qml/qqmlcontextwrapper_p.h b/src/qml/qml/qqmlcontextwrapper_p.h
deleted file mode 100644
index 126ffecf0d..0000000000
--- a/src/qml/qml/qqmlcontextwrapper_p.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QQMLCONTEXTWRAPPER_P_H
-#define QQMLCONTEXTWRAPPER_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtCore/qglobal.h>
-#include <private/qtqmlglobal_p.h>
-
-#include <private/qv4object_p.h>
-#include <private/qqmlcontext_p.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace QV4 {
-
-namespace Heap {
-
-struct QmlContextWrapper : Object {
-    void init(QQmlContextData *context, QObject *scopeObject, bool ownsContext = false);
-    void destroy();
-    bool readOnly;
-    bool ownsContext;
-    bool isNullWrapper;
-
-    QQmlGuardedContextData *context;
-    QQmlQPointer<QObject> scopeObject;
-};
-
-}
-
-struct Q_QML_EXPORT QmlContextWrapper : Object
-{
-    V4_OBJECT2(QmlContextWrapper, Object)
-    V4_NEEDS_DESTROY
-
-    static ReturnedValue qmlScope(ExecutionEngine *e, QQmlContextData *ctxt, QObject *scope);
-    static ReturnedValue urlScope(ExecutionEngine *v4, const QUrl &);
-
-    void takeContextOwnership() {
-        d()->ownsContext = true;
-    }
-
-    inline QObject *getScopeObject() const { return d()->scopeObject; }
-    inline QQmlContextData *getContext() const { return *d()->context; }
-
-    void setReadOnly(bool b) { d()->readOnly = b; }
-
-    static ReturnedValue get(const Managed *m, String *name, bool *hasProperty);
-    static void put(Managed *m, String *name, const Value &value);
-};
-
-}
-
-QT_END_NAMESPACE
-
-#endif // QV8CONTEXTWRAPPER_P_H
-
diff --git a/src/qml/qml/qqmldelayedcallqueue.cpp b/src/qml/qml/qqmldelayedcallqueue.cpp
index d10a8c7718..7552e1e82b 100644
--- a/src/qml/qml/qqmldelayedcallqueue.cpp
+++ b/src/qml/qml/qqmldelayedcallqueue.cpp
@@ -43,7 +43,6 @@
 #include <private/qqmljavascriptexpression_p.h>
 #include <private/qv4value_p.h>
 #include <private/qv4qobjectwrapper_p.h>
-#include <private/qqmlcontextwrapper_p.h>
 
 #include <QQmlError>
 
diff --git a/src/qml/qml/qqmljavascriptexpression.cpp b/src/qml/qml/qqmljavascriptexpression.cpp
index 8020bdb2be..54d9222a8e 100644
--- a/src/qml/qml/qqmljavascriptexpression.cpp
+++ b/src/qml/qml/qqmljavascriptexpression.cpp
@@ -374,7 +374,7 @@ QQmlJavaScriptExpression::evalFunction(QQmlContextData *ctxt, QObject *scopeObje
     QV4::ExecutionEngine *v4 = QV8Engine::getV4(ep->v8engine());
     QV4::Scope scope(v4);
 
-    QV4::Scoped<QV4::QmlContext> qmlContext(scope, v4->rootContext()->newQmlContext(ctxt, scopeObject));
+    QV4::Scoped<QV4::QmlContext> qmlContext(scope, QV4::QmlContext::create(v4->rootContext(), ctxt, scopeObject));
     QV4::Script script(v4, qmlContext, code, filename, line);
     QV4::ScopedValue result(scope);
     script.parse();
@@ -404,7 +404,7 @@ void QQmlJavaScriptExpression::createQmlBinding(QQmlContextData *ctxt, QObject *
     QV4::ExecutionEngine *v4 = QV8Engine::getV4(ep->v8engine());
     QV4::Scope scope(v4);
 
-    QV4::Scoped<QV4::QmlContext> qmlContext(scope, v4->rootContext()->newQmlContext(ctxt, qmlScope));
+    QV4::Scoped<QV4::QmlContext> qmlContext(scope, QV4::QmlContext::create(v4->rootContext(), ctxt, qmlScope));
     QV4::Script script(v4, qmlContext, code, filename, line);
     QV4::ScopedValue result(scope);
     script.parse();
diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp
index d07be77697..76829c48c9 100644
--- a/src/qml/qml/qqmlobjectcreator.cpp
+++ b/src/qml/qml/qqmlobjectcreator.cpp
@@ -44,7 +44,6 @@
 #include <private/qv4function_p.h>
 #include <private/qv4functionobject_p.h>
 #include <private/qv4qobjectwrapper_p.h>
-#include <private/qqmlcontextwrapper_p.h>
 #include <private/qqmlbinding_p.h>
 #include <private/qqmlstringconverters_p.h>
 #include <private/qqmlboundsignal_p.h>
@@ -1017,7 +1016,7 @@ void QQmlObjectCreator::registerObjectWithContextById(const QV4::CompiledData::O
 QV4::Heap::QmlContext *QQmlObjectCreator::currentQmlContext()
 {
     if (!_qmlContext->isObject())
-        _qmlContext->setM(v4->rootContext()->newQmlContext(context, _scopeObject));
+        _qmlContext->setM(QV4::QmlContext::create(v4->rootContext(), context, _scopeObject));
 
     return _qmlContext->d();
 }
diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp
index 09b9dcf452..7ad18c8efb 100644
--- a/src/qml/qml/qqmltypeloader.cpp
+++ b/src/qml/qml/qqmltypeloader.cpp
@@ -39,7 +39,6 @@
 
 #include "qqmltypeloader_p.h"
 #include "qqmlabstracturlinterceptor.h"
-#include "qqmlcontextwrapper_p.h"
 #include "qqmlexpression_p.h"
 
 #include <private/qqmlengine_p.h>
@@ -2833,7 +2832,7 @@ QV4::ReturnedValue QQmlScriptData::scriptValueForContext(QQmlContextData *parent
         return QV4::Encode::undefined();
     }
 
-    QV4::Scoped<QV4::QmlContext> qmlContext(scope, v4->rootContext()->newQmlContext(ctxt, 0));
+    QV4::Scoped<QV4::QmlContext> qmlContext(scope, QV4::QmlContext::create(v4->rootContext(), ctxt, 0));
     qmlContext->takeContextOwnership();
 
     m_program->qmlContext.set(scope.engine, qmlContext);
diff --git a/src/qml/qml/qqmltypewrapper.cpp b/src/qml/qml/qqmltypewrapper.cpp
index 5c3ad6b2a6..fd1e9cc2be 100644
--- a/src/qml/qml/qqmltypewrapper.cpp
+++ b/src/qml/qml/qqmltypewrapper.cpp
@@ -38,7 +38,6 @@
 ****************************************************************************/
 
 #include "qqmltypewrapper_p.h"
-#include <private/qqmlcontextwrapper_p.h>
 #include <private/qv8engine_p.h>
 
 #include <private/qqmlengine_p.h>
diff --git a/src/qml/qml/qqmlvaluetypewrapper.cpp b/src/qml/qml/qqmlvaluetypewrapper.cpp
index be93baf9f6..8fb1f869ff 100644
--- a/src/qml/qml/qqmlvaluetypewrapper.cpp
+++ b/src/qml/qml/qqmlvaluetypewrapper.cpp
@@ -43,7 +43,6 @@
 #include <private/qqmlvaluetype_p.h>
 #include <private/qqmlbinding_p.h>
 #include <private/qqmlglobal_p.h>
-#include <private/qqmlcontextwrapper_p.h>
 #include <private/qqmlbuiltinfunctions_p.h>
 
 #include <private/qv4engine_p.h>
diff --git a/src/qml/qml/qqmlvme.cpp b/src/qml/qml/qqmlvme.cpp
index 01c4f476d6..72d4ab7e8f 100644
--- a/src/qml/qml/qqmlvme.cpp
+++ b/src/qml/qml/qqmlvme.cpp
@@ -62,7 +62,6 @@
 #include "qqmlpropertyvalueinterceptor_p.h"
 #include "qqmlvaluetypeproxybinding_p.h"
 #include "qqmlexpression_p.h"
-#include "qqmlcontextwrapper_p.h"
 
 #include <QStack>
 #include <QPointF>
diff --git a/src/qml/qml/qqmlxmlhttprequest.cpp b/src/qml/qml/qqmlxmlhttprequest.cpp
index 6b86e38f19..47751aa2c6 100644
--- a/src/qml/qml/qqmlxmlhttprequest.cpp
+++ b/src/qml/qml/qqmlxmlhttprequest.cpp
@@ -50,7 +50,6 @@
 #include <private/qv4domerrors_p.h>
 #include <private/qv4engine_p.h>
 #include <private/qv4functionobject_p.h>
-#include <private/qqmlcontextwrapper_p.h>
 #include <private/qv4scopedvalue_p.h>
 
 #include <QtCore/qobject.h>
diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp
index 1df468dd49..dadff819cf 100644
--- a/src/qml/qml/v8/qv8engine.cpp
+++ b/src/qml/qml/v8/qv8engine.cpp
@@ -52,7 +52,6 @@
 #include <private/qqmlplatform_p.h>
 #include <private/qjsvalue_p.h>
 #include <private/qqmltypewrapper_p.h>
-#include <private/qqmlcontextwrapper_p.h>
 #include <private/qqmlvaluetypewrapper_p.h>
 #include <private/qqmllistwrapper_p.h>
 #include <private/qv4scopedvalue_p.h>