diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-03-25 10:59:43 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-03-25 10:59:43 +0000 |
| commit | e2863c80fed06104eedfe83bce2737f2d24908a6 (patch) | |
| tree | 7981bfb6f3d9ea9f74a58da688e4a26caec19aee /tools/qmlcachegen | |
| parent | 8bed5de48c3ec24f9ad335e5398d92d0a60c448c (diff) | |
| parent | 7f325896634a3b99e778d90e5fe738a47f855526 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.8' into 5.9" into refs/staging/5.9
Diffstat (limited to 'tools/qmlcachegen')
| -rw-r--r-- | tools/qmlcachegen/qmlcachegen.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/tools/qmlcachegen/qmlcachegen.cpp b/tools/qmlcachegen/qmlcachegen.cpp index 657b1e8501..f24ec40184 100644 --- a/tools/qmlcachegen/qmlcachegen.cpp +++ b/tools/qmlcachegen/qmlcachegen.cpp @@ -180,9 +180,7 @@ static bool compileQmlFile(const QString &inputFileName, const QString &outputFi // Disable lookups in non-standalone (aka QML) mode isel->setUseFastLookups(false); irDocument.javaScriptCompilationUnit = isel->compile(/*generate unit*/false); - // ### - QV4::CompiledData::ResolvedTypeReferenceMap dummyDependencies; - QV4::CompiledData::Unit *unit = generator.generate(irDocument, /*engine*/nullptr, dummyDependencies); + QV4::CompiledData::Unit *unit = generator.generate(irDocument); unit->flags |= QV4::CompiledData::Unit::StaticData; unit->flags |= QV4::CompiledData::Unit::PendingTypeCompilation; irDocument.javaScriptCompilationUnit->data = unit; @@ -271,9 +269,7 @@ static bool compileJSFile(const QString &inputFileName, const QString &outputFil // Disable lookups in non-standalone (aka QML) mode isel->setUseFastLookups(false); irDocument.javaScriptCompilationUnit = isel->compile(/*generate unit*/false); - // ### - QV4::CompiledData::ResolvedTypeReferenceMap dummyDependencies; - QV4::CompiledData::Unit *unit = generator.generate(irDocument, /*engine*/nullptr, dummyDependencies); + QV4::CompiledData::Unit *unit = generator.generate(irDocument); unit->flags |= QV4::CompiledData::Unit::StaticData; irDocument.javaScriptCompilationUnit->data = unit; |