diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2016-11-15 17:28:44 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-23 13:53:53 +0000 |
| commit | 435e7b17a35f4aa2cc2a7cb3ac935cf56ee27d62 (patch) | |
| tree | 4be40028dfb66f2ace6dc1582bd004d3a80fcd15 /mkspecs | |
| parent | 0810d48bc4cb820c0cba982a2ec392058eccd466 (diff) | |
Fix qmldir copying in debug and release builds on Windows
This is a backport of 6cc02ce6c85d3dbd49a55060bd21a8359884786f from 5.7.
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.
Task-number: QTBUG-57153
Change-Id: Ibac759b16cebaf04f5d2f785211b62071aa656a8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qml_module.prf | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf index b09d42a0a4..47ebe78400 100644 --- a/mkspecs/features/qml_module.prf +++ b/mkspecs/features/qml_module.prf @@ -28,4 +28,8 @@ qmldir.files = $$fq_qml_files qmldir.path = $$instbase/$$TARGETPATH INSTALLS += qmldir -!prefix_build: COPIES += qmldir +!debug_and_release|!build_all|CONFIG(release, debug|release) { + !prefix_build { + COPIES += qmldir + } +} |