diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-03-15 10:09:54 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-03-15 10:44:33 +0100 |
| commit | 7f325896634a3b99e778d90e5fe738a47f855526 (patch) | |
| tree | 8d68eec97ab0f8e00859ef16061c67f36d5925a1 /tools/qmlcachegen/qmlcachegen.cpp | |
| parent | 8469f0501d9c581a6b2fd2e380187a00b47c6f8d (diff) | |
| parent | 8675bb6b5a4721aa4d94dcb3cb98dbed061c164f (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
src/qml/compiler/qqmltypecompiler.cpp
src/qml/compiler/qqmltypecompiler_p.h
src/qml/qml/qqmltypeloader.cpp
src/qml/qml/qqmltypeloader_p.h
Change-Id: I4894555ab7a0879b56bbda7a46d16d1c40c19e7c
Diffstat (limited to 'tools/qmlcachegen/qmlcachegen.cpp')
| -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 9a68e2ac97..207f53b79e 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; |