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>
This commit is contained in:
parent
6b8f422c5e
commit
63d24a746d
@ -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
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user