diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-10-18 13:20:41 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-18 20:05:56 +0200 |
| commit | ab17a3c3c40d578397fd9d2d03eda8e13976fcfc (patch) | |
| tree | 94cc1c1e21db7f81cc45aa50cefffa28016dcfc4 | |
| parent | bae926e66d74bbd5ab00d1d0bcb92671ab812e8e (diff) | |
remove broken validation of QMLIMPORTSCANNER
the variable may contain a complex command, so an exists() check is
doomed to failure if the tool is built dynamically.
also, the check is not really necessary: it failing indicates a bug in
the qt build system, and we don't really need to complicate the code to
deal with such corner cases.
Change-Id: I2e6087dcc6dd4a4f70bdf739550276f364c880dd
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| -rw-r--r-- | mkspecs/features/qt.prf | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 59147faffc..04375d4ce1 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -78,21 +78,16 @@ if(contains(QT, qml)|contains(QT_PRIVATE, qml)): \ contains(QT_CONFIG, static):contains(TEMPLATE, .*app):!host_build:!no_import_scan { # run qmlimportscanner qtPrepareTool(QMLIMPORTSCANNER, qmlimportscanner) - exists($$QMLIMPORTSCANNER) { - for (MODULE, QT_MODULES) { - PATH = $$eval(QT.$${MODULE}.qml) - !isEmpty(PATH): QMLPATHS += $$PATH - } - QMLPATHS = $$unique(QMLPATHS) - for (QMLPATH, QMLPATHS): \ - IMPORTPATHS += -importPath $$QMLPATH - - #message(run $$QMLIMPORTSCANNER $$_PRO_FILE_PWD_ $$IMPORTPATHS) - JSON = $$system($$QMLIMPORTSCANNER $$_PRO_FILE_PWD_ $$IMPORTPATHS) - } else { - error("qmlimportscanner is missing. Rebuild qtdeclarative/tools/qmlimportscanner.") - JSON = [] + for (MODULE, QT_MODULES) { + PATH = $$eval(QT.$${MODULE}.qml) + !isEmpty(PATH): QMLPATHS += $$PATH } + QMLPATHS = $$unique(QMLPATHS) + for (QMLPATH, QMLPATHS): \ + IMPORTPATHS += -importPath $$QMLPATH + + #message(run $$QMLIMPORTSCANNER $$_PRO_FILE_PWD_ $$IMPORTPATHS) + JSON = $$system($$QMLIMPORTSCANNER $$_PRO_FILE_PWD_ $$IMPORTPATHS) parseJson(JSON, IMPORTS)| error("Failed to parse qmlimportscanner output.") |