diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-02-14 08:21:39 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-02-14 08:21:39 +0100 |
| commit | 802bebd566574153e7bf96470199732bf36c36da (patch) | |
| tree | df749b7bdcea1ef37fa6c4cd7ca502b94d839415 /tools | |
| parent | 24d4e164ad4ef0bf8e5a4a0f2c28e3b9df48d352 (diff) | |
| parent | 32f6315d6d458600bb3f1db08c53148557382c21 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I372850330c1d92edc5b07596759f0db3a59082a8
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmlcachegen/qmlcachegen.cpp | 3 | ||||
| -rw-r--r-- | tools/tools.pro | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tools/qmlcachegen/qmlcachegen.cpp b/tools/qmlcachegen/qmlcachegen.cpp index 4b902eda0f..10d9829520 100644 --- a/tools/qmlcachegen/qmlcachegen.cpp +++ b/tools/qmlcachegen/qmlcachegen.cpp @@ -141,7 +141,8 @@ static bool compileQmlFile(const QString &inputFileName, QV4::EvalISelFactory *i // ### translation binding simplification - QScopedPointer<QV4::EvalInstructionSelection> isel(iselFactory->create(/*engine*/nullptr, /*executable allocator*/nullptr, &irDocument.jsModule, &irDocument.jsGenerator)); + QV4::ExecutableAllocator allocator; + QScopedPointer<QV4::EvalInstructionSelection> isel(iselFactory->create(/*engine*/nullptr, &allocator, &irDocument.jsModule, &irDocument.jsGenerator)); // Disable lookups in non-standalone (aka QML) mode isel->setUseFastLookups(false); irDocument.javaScriptCompilationUnit = isel->compile(/*generate unit*/false); diff --git a/tools/tools.pro b/tools/tools.pro index f3988a909a..1a90b8e776 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -2,7 +2,8 @@ TEMPLATE = subdirs QT_FOR_CONFIG += qml-private SUBDIRS += \ qmlmin \ - qmlimportscanner + qmlimportscanner \ + qmlcachegen !android|android_app { SUBDIRS += \ @@ -27,7 +28,7 @@ SUBDIRS += \ qml.depends = qmlimportscanner qmleasing.depends = qmlimportscanner -# qmlmin, qmlimportscanner & qmlbundle are build tools. +# qmlmin, qmlimportscanner & qmlcachegen are build tools. # qmlscene is needed by the autotests. # qmltestrunner may be useful for manual testing. # qmlplugindump cannot be a build tool, because it loads target plugins. |