diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-08-14 15:18:40 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-09-08 18:34:09 +0000 |
| commit | 548cc400a780f795cceef0eb841191a3669f58f2 (patch) | |
| tree | 30c42c235b32676b957a449d71b3c7cc53d4e6ab /src/qml/jsruntime/qv4include.cpp | |
| parent | f770cebdd3d6a7f31c21e1bf04d386178122bc84 (diff) | |
QV4Include doesn't need a contextdata
Change-Id: I062483b4bca0dd4c1e41accdd3aef4f11f3446ba
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/jsruntime/qv4include.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4include.cpp | 8 |
1 files changed, 3 insertions, 5 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 { |