diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2016-06-08 16:48:28 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2016-08-13 11:26:40 +0000 |
| commit | 63d24a746da8d7a07eb2f1367757f24cfb4e9eae (patch) | |
| tree | 52d71c93fe191658ea4c1f5c092e4d57ced9675e /mkspecs | |
| parent | 6b8f422c5e56b95aad298e1b984fb60fba1da282 (diff) | |
Copy qmldir file even for prefix builds
The qmldir file is needed in the build dir for non-installed
static builds, so that qmlimportscanner can work.
Change-Id: I9028db6d1e36da5a2be9b0c1ba4c9d475edd5cb5
Task-number: QTBUG-53926
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qml_module.prf | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf index 05f97a5532..fb006efb65 100644 --- a/mkspecs/features/qml_module.prf +++ b/mkspecs/features/qml_module.prf @@ -18,10 +18,15 @@ fq_qml_files = $$qmldir_file for(qmlf, QML_FILES): fq_qml_files += $$absolute_path($$qmlf, $$_PRO_FILE_PWD_) -qml1_target: \ +load(qt_build_paths) + +qml1_target { + DESTDIR = $$MODULE_BASE_OUTDIR/imports/$$TARGETPATH instbase = $$[QT_INSTALL_IMPORTS] -else: \ +} else { + DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH instbase = $$[QT_INSTALL_QML] +} !qml1_target:static: CONFIG += builtin_resources @@ -41,4 +46,11 @@ else: qmldir.files = $$qmldir_file qmldir.path = $$instbase/$$TARGETPATH INSTALLS += qmldir -!prefix_build: COPIES += qmldir +!prefix_build { + COPIES += qmldir +} else { + # For non-installed static builds, qmlimportscanner needs qmldir file in build dir + qmldir2build.files = $$qmldir_file + qmldir2build.path = $$DESTDIR + COPIES += qmldir2build +} |