diff options
-rw-r--r-- | src/qml/jsruntime/qv4include.cpp | 8 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4include_p.h | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/qml/jsruntime/qv4include.cpp b/src/qml/jsruntime/qv4include.cpp index 2eb61081c7..a95b1ce5ac 100644 --- a/src/qml/jsruntime/qv4include.cpp +++ b/src/qml/jsruntime/qv4include.cpp @@ -49,9 +49,9 @@ QT_BEGIN_NAMESPACE -QV4Include::QV4Include(const QUrl &url, QV4::ExecutionEngine *engine, QQmlContextData *context, +QV4Include::QV4Include(const QUrl &url, QV4::ExecutionEngine *engine, const QV4::Value &qmlglobal, const QV4::Value &callback) - : v4(engine), m_network(0), m_reply(0), m_url(url), m_redirectCount(0), m_context(context) + : v4(engine), m_network(0), m_reply(0), m_url(url), m_redirectCount(0) { m_qmlglobal.set(engine, qmlglobal); if (callback.as<QV4::FunctionObject>()) @@ -193,9 +193,7 @@ QV4::ReturnedValue QV4Include::method_include(QV4::CallContext *ctx) QV4::ScopedObject qmlcontextobject(scope, scope.engine->qmlContextObject()); if (localFile.isEmpty()) { - QV4Include *i = new QV4Include(url, scope.engine, context, - qmlcontextobject, - callbackFunction); + QV4Include *i = new QV4Include(url, scope.engine, qmlcontextobject, callbackFunction); result = i->result(); } else { diff --git a/src/qml/jsruntime/qv4include_p.h b/src/qml/jsruntime/qv4include_p.h index 5ef4442b03..fc99ff7589 100644 --- a/src/qml/jsruntime/qv4include_p.h +++ b/src/qml/jsruntime/qv4include_p.h @@ -76,8 +76,7 @@ private Q_SLOTS: void finished(); private: - QV4Include(const QUrl &url, QV4::ExecutionEngine *engine, QQmlContextData *context, - const QV4::Value &qmlglobal, const QV4::Value &callback); + QV4Include(const QUrl &url, QV4::ExecutionEngine *engine, const QV4::Value &qmlglobal, const QV4::Value &callback); ~QV4Include(); QV4::ReturnedValue result(); @@ -95,7 +94,6 @@ private: QV4::PersistentValue m_callbackFunction; QV4::PersistentValue m_resultObject; - QQmlGuardedContextData m_context; QV4::PersistentValue m_qmlglobal; }; |