diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-07-10 17:23:39 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-07-10 18:22:40 +0200 |
| commit | 9a8dd594b5f953d385d69b1ea0d74939f69b4728 (patch) | |
| tree | b337bd785474a18de223f238a94107859ac46ee2 /tools/qmlcachegen | |
| parent | 9a9c526f6876fed7f23c79e4d82f6fe0fbc22041 (diff) | |
Merge JSCodeGen and QQmlJSCodeGenerator
Change-Id: I2219cba0dd3782cb2e0b09b8f3c4d5472e6e5d7e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tools/qmlcachegen')
| -rw-r--r-- | tools/qmlcachegen/qmlcachegen.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
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()) { |