diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-09-15 17:32:59 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-09-30 18:33:13 +0200 |
| commit | c74c548af3059ec479911efe371575b878480835 (patch) | |
| tree | a8251283cc64d61c0992291e1717970838b6629e /mkspecs | |
| parent | c016aeba325ae836e665a48221bdda4b0c744f12 (diff) | |
micro-optimization: make use of qtPrepareTool()'s new mode
avoids that we needlessly initialize QMLIMPORTSCANNER in addition to
QMLIMPORTSCANNER_SYS (by making the former have the contents of the
latter).
Change-Id: Ib8a12975de426ae94bd78d489099157c94cea189
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'mkspecs')
| -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 71dfcf2912..b1fc248ea0 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -89,12 +89,12 @@ contains(qt_module_deps, qml): \ } # run qmlimportscanner - qtPrepareTool(QMLIMPORTSCANNER, qmlimportscanner, _SYS) + qtPrepareTool(QMLIMPORTSCANNER, qmlimportscanner, , system) for (QMLPATH, QMLPATHS): \ IMPORTPATHS += -importPath $$QMLPATH - #message(run $$QMLIMPORTSCANNER_SYS $$_PRO_FILE_PWD_ $$IMPORTPATHS) - JSON = $$system($$QMLIMPORTSCANNER_SYS $$_PRO_FILE_PWD_ $$IMPORTPATHS) + #message(run $$QMLIMPORTSCANNER $$_PRO_FILE_PWD_ $$IMPORTPATHS) + JSON = $$system($$QMLIMPORTSCANNER $$_PRO_FILE_PWD_ $$IMPORTPATHS) parseJson(JSON, IMPORTS)| error("Failed to parse qmlimportscanner output.") |