diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-05-12 15:23:27 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-23 11:39:25 +0200 |
| commit | a658fa40d3c4d61ac3c655df9f57630a26192d74 (patch) | |
| tree | e486f52bb6c68bd48e18ed752738536078e3c5b6 /mkspecs/features/qt.prf | |
| parent | 7c94b8955f5c0e0fe0633f2a4ddfd0c050e02f62 (diff) | |
fix/simplify the qmlimportscanner's import path construction
now that we have QTREPOS, we can use that directly instead of collecting
the QT.<foo>.qml dirs. as a "side effect", this makes qml modules without
a corresponding c++ module available to the scan.
Change-Id: I6f172121588ec01c9fa47a99d9990bf9fcfbc69f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'mkspecs/features/qt.prf')
| -rw-r--r-- | mkspecs/features/qt.prf | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 54423017ee..c3395d09ac 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -82,13 +82,9 @@ contains(qt_module_deps, qml): \ contains(QT_CONFIG, static):contains(TEMPLATE, .*app):!host_build:!no_import_scan { # run qmlimportscanner qtPrepareTool(QMLIMPORTSCANNER, qmlimportscanner) - for (MODULE, QT_MODULES) { - PATH = $$eval(QT.$${MODULE}.qml) - !isEmpty(PATH):exists($$PATH): QMLPATHS += $$PATH - } - QMLPATHS = $$unique(QMLPATHS) - for (QMLPATH, QMLPATHS): \ - IMPORTPATHS += -importPath $$QMLPATH + for (qrep, QTREPOS): \ + exists($$qrep/qml): \ + IMPORTPATHS += -importPath $$qrep/qml #message(run $$QMLIMPORTSCANNER $$_PRO_FILE_PWD_ $$IMPORTPATHS) JSON = $$system($$QMLIMPORTSCANNER $$_PRO_FILE_PWD_ $$IMPORTPATHS) |