aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4script.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2017-06-30 08:44:09 +0200
committerErik Verbruggen <erik.verbruggen@qt.io>2017-06-30 11:35:29 +0000
commit3a9f4d3ae701c7119016a0bf8b4e65ceb17864b0 (patch)
tree760bd51b4775ecc3f48c3ca649699c952b841fbf /src/qml/jsruntime/qv4script.cpp
parent12ff47eb52fdaf01589b61a3f879d2f5edf7962f (diff)
Get rid of IR::Module and IR::Function
Fold the stuff from IR::Function into QQmlJS::Context, and add a QQmlJS::Module class to replace the last pieces of the old IR. Change-Id: Ic02a6738a4f1db67a0ddf97b6c93ca32be81789d Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4script.cpp')
-rw-r--r--src/qml/jsruntime/qv4script.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4script.cpp b/src/qml/jsruntime/qv4script.cpp
index 7ea16020a5..13f84ccd0e 100644
--- a/src/qml/jsruntime/qv4script.cpp
+++ b/src/qml/jsruntime/qv4script.cpp
@@ -88,7 +88,7 @@ void Script::parse()
ExecutionEngine *v4 = scope->engine();
Scope valueScope(v4);
- IR::Module module(v4->debugger() != 0);
+ QQmlJS::Module module(v4->debugger() != 0);
QQmlJS::Engine ee, *engine = &ee;
Lexer lexer(engine);
@@ -176,7 +176,7 @@ Function *Script::function()
return vmFunction;
}
-QQmlRefPointer<QV4::CompiledData::CompilationUnit> Script::precompile(IR::Module *module, Compiler::JSUnitGenerator *unitGenerator,
+QQmlRefPointer<QV4::CompiledData::CompilationUnit> Script::precompile(QQmlJS::Module *module, Compiler::JSUnitGenerator *unitGenerator,
const QUrl &url, const QString &source, QList<QQmlError> *reportedErrors,
QQmlJS::Directives *directivesCollector)
{