diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-06-02 11:40:36 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-06-05 17:11:53 +0200 |
| commit | 7a1e17a3500b182350a638ab08c8c74ee1c205c1 (patch) | |
| tree | b49c688fefe6c0c577ad15fde3a48e9749398d7e /mkspecs/features/qt.prf | |
| parent | 12bbd15e0f9dfdf6c13980c04e284993f467893b (diff) | |
unbreak static qml imports again
a) qmlimportscanner has no built-in -importPath, so it can't be omitted
even for non-prefix builds, and b) the QMLPATHS variable is also used
further down, so we can't just do away with it.
amends a658fa40.
Change-Id: I42a47a82fe13694fbac3c4a3962ebbe1d7e7865b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Diffstat (limited to 'mkspecs/features/qt.prf')
| -rw-r--r-- | mkspecs/features/qt.prf | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index c3395d09ac..f8ba3c58b2 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -80,11 +80,18 @@ qt_module_deps = $$resolve_depends(qt_module_deps, "QT.") # static builds: link qml import plugins into the app. contains(qt_module_deps, qml): \ contains(QT_CONFIG, static):contains(TEMPLATE, .*app):!host_build:!no_import_scan { + !isEmpty(QTREPOS) { + for (qrep, QTREPOS): \ + exists($$qrep/qml): \ + QMLPATHS += $$qrep/qml + } else { + QMLPATHS += $$[QT_INSTALL_QML/get] + } + # run qmlimportscanner qtPrepareTool(QMLIMPORTSCANNER, qmlimportscanner) - for (qrep, QTREPOS): \ - exists($$qrep/qml): \ - IMPORTPATHS += -importPath $$qrep/qml + for (QMLPATH, QMLPATHS): \ + IMPORTPATHS += -importPath $$QMLPATH #message(run $$QMLIMPORTSCANNER $$_PRO_FILE_PWD_ $$IMPORTPATHS) JSON = $$system($$QMLIMPORTSCANNER $$_PRO_FILE_PWD_ $$IMPORTPATHS) |