diff options
| author | Ray Donnelly <mingw.android@gmail.com> | 2014-03-10 23:31:16 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-19 18:06:20 +0100 |
| commit | da77aaa98c8ab40b26154011473a3d2de5e27ffe (patch) | |
| tree | 5ec51a633cc25bb2b3db1b4a950d41fb05bed10c /mkspecs/features/qt.prf | |
| parent | 9891c5051f02b940f6dc94ac4ccf945e036feb13 (diff) | |
qmlimportscanner: Ensure the correct variant is run
qmlimportscanner is run as a $$system command (as opposed
to as a makefile command) so specify it as such to
qtPrepareTool and run it as such too.
The distinction is important for MinGW-w64 static
builds where it must be run via cmd.exe and not sh.exe.
Change-Id: I0832d5138bff7f4fa1968646df28d2367ad062c2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'mkspecs/features/qt.prf')
| -rw-r--r-- | mkspecs/features/qt.prf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index fb83e59e65..7a613fe0ff 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -80,7 +80,7 @@ qt_module_deps = $$resolve_depends(qt_module_deps, "QT.") contains(qt_module_deps, qml): \ contains(QT_CONFIG, static):contains(TEMPLATE, .*app):!host_build:!no_import_scan { # run qmlimportscanner - qtPrepareTool(QMLIMPORTSCANNER, qmlimportscanner) + qtPrepareTool(QMLIMPORTSCANNER, qmlimportscanner, _SYS) for (MODULE, QT_MODULES) { PATH = $$eval(QT.$${MODULE}.qml) !isEmpty(PATH):exists($$PATH): QMLPATHS += $$PATH @@ -89,8 +89,8 @@ contains(qt_module_deps, qml): \ for (QMLPATH, QMLPATHS): \ IMPORTPATHS += -importPath $$QMLPATH - #message(run $$QMLIMPORTSCANNER $$_PRO_FILE_PWD_ $$IMPORTPATHS) - JSON = $$system($$QMLIMPORTSCANNER $$_PRO_FILE_PWD_ $$IMPORTPATHS) + #message(run $$QMLIMPORTSCANNER_SYS $$_PRO_FILE_PWD_ $$IMPORTPATHS) + JSON = $$system($$QMLIMPORTSCANNER_SYS $$_PRO_FILE_PWD_ $$IMPORTPATHS) parseJson(JSON, IMPORTS)| error("Failed to parse qmlimportscanner output.") |