Fix qmldir copying in debug and release builds on Windows
In a parallel build we may end up copying the qmldir file at the same time, which doesn't work on Windows due to file locking. Apply the same guard for the copying condition as in commit 770a0c91f3fadcdb132d9eb96d085aafbe1bacd0. Change-Id: Ia34395e8654acf192b94e7ea6d0137730e4ea027 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
parent
63d24a746d
commit
6cc02ce6c8
@ -46,11 +46,13 @@ else: qmldir.files = $$qmldir_file
|
||||
qmldir.path = $$instbase/$$TARGETPATH
|
||||
INSTALLS += 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
|
||||
!debug_and_release|!build_all|CONFIG(release, debug|release) {
|
||||
!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