diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-05-15 15:32:04 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-05-15 15:32:04 +0200 |
| commit | 6e5251dd3d7b21b67693a79d3470ec2ba80ba97e (patch) | |
| tree | 9df6575fa02be4f47bc9a97dafad6ac71f02419f /tools/qmlcachegen | |
| parent | b159b766eb7974419c2f16a01a8d15221c352dbf (diff) | |
| parent | 9ef0d2da99f4593d50c16912d00bef121bb76f9b (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/qml/qml/qqmltypeloader.cpp
Change-Id: If9874faf23e813b05ee4cf042133a528d73ba72a
Diffstat (limited to 'tools/qmlcachegen')
| -rw-r--r-- | tools/qmlcachegen/qmlcachegen.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qmlcachegen/qmlcachegen.cpp b/tools/qmlcachegen/qmlcachegen.cpp index ed8b3c19a5..c308f12814 100644 --- a/tools/qmlcachegen/qmlcachegen.cpp +++ b/tools/qmlcachegen/qmlcachegen.cpp @@ -262,7 +262,7 @@ static bool compileJSFile(const QString &inputFileName, const QString &inputFile } QQmlJS::Engine *engine = &irDocument.jsParserEngine; - QmlIR::ScriptDirectivesCollector directivesCollector(engine, &irDocument.jsGenerator); + QmlIR::ScriptDirectivesCollector directivesCollector(&irDocument); QQmlJS::Directives *oldDirs = engine->directives(); engine->setDirectives(&directivesCollector); |