From 9a8dd594b5f953d385d69b1ea0d74939f69b4728 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Wed, 10 Jul 2019 17:23:39 +0200 Subject: Merge JSCodeGen and QQmlJSCodeGenerator Change-Id: I2219cba0dd3782cb2e0b09b8f3c4d5472e6e5d7e Reviewed-by: Simon Hausmann --- tools/qmlcachegen/qmlcachegen.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'tools/qmlcachegen/qmlcachegen.cpp') diff --git a/tools/qmlcachegen/qmlcachegen.cpp b/tools/qmlcachegen/qmlcachegen.cpp index cbfc110089..2cbadeeb60 100644 --- a/tools/qmlcachegen/qmlcachegen.cpp +++ b/tools/qmlcachegen/qmlcachegen.cpp @@ -205,10 +205,7 @@ static bool compileQmlFile(const QString &inputFileName, SaveFunction saveFuncti annotateListElements(&irDocument); { - QmlIR::JSCodeGen v4CodeGen(irDocument.code, - &irDocument.jsGenerator, &irDocument.jsModule, - &irDocument.jsParserEngine, irDocument.program, - &irDocument.jsGenerator.stringTable, illegalNames); + QmlIR::JSCodeGen v4CodeGen(&irDocument, illegalNames); for (QmlIR::Object *object: qAsConst(irDocument.objects)) { if (object->functionsAndExpressions->count == 0) continue; @@ -309,9 +306,7 @@ static bool compileJSFile(const QString &inputFileName, const QString &inputFile } { - QmlIR::JSCodeGen v4CodeGen(irDocument.code, &irDocument.jsGenerator, - &irDocument.jsModule, &irDocument.jsParserEngine, - irDocument.program, &irDocument.jsGenerator.stringTable, illegalNames); + QmlIR::JSCodeGen v4CodeGen(&irDocument, illegalNames); v4CodeGen.generateFromProgram(inputFileName, inputFileUrl, sourceCode, program, &irDocument.jsModule, QV4::Compiler::ContextType::ScriptImportedByQML); if (v4CodeGen.hasError()) { -- cgit v1.2.3 From f5e4f0784176a6c6e80176b1916ebe8a571f3646 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Tue, 9 Jul 2019 14:30:24 +0200 Subject: Disentangle includes and namespaces Avoid using namespace in headers and include only the headers we actually need. Change-Id: I526a0f874dc09b07693fd87070665be396d3b637 Reviewed-by: Simon Hausmann --- tools/qmlcachegen/qmlcachegen.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tools/qmlcachegen/qmlcachegen.cpp') diff --git a/tools/qmlcachegen/qmlcachegen.cpp b/tools/qmlcachegen/qmlcachegen.cpp index 2cbadeeb60..cfbd1cd87d 100644 --- a/tools/qmlcachegen/qmlcachegen.cpp +++ b/tools/qmlcachegen/qmlcachegen.cpp @@ -45,6 +45,8 @@ #include +using namespace QQmlJS; + int filterResourceFile(const QString &input, const QString &output); bool generateLoader(const QStringList &compiledFiles, const QStringList &retainedFiles, const QString &output, const QStringList &resourceFileMappings, -- cgit v1.2.3