diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-08-15 14:42:27 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-08-15 13:23:15 +0000 |
| commit | 6cc02ce6c85d3dbd49a55060bd21a8359884786f (patch) | |
| tree | 9776e10feb49a864b9a3e2438f3d4e6b3fcc30b5 | |
| parent | 63d24a746da8d7a07eb2f1367757f24cfb4e9eae (diff) | |
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>
| -rw-r--r-- | mkspecs/features/qml_module.prf | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf index fb006efb65..6b08ea3a1a 100644 --- a/mkspecs/features/qml_module.prf +++ b/mkspecs/features/qml_module.prf @@ -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 + } } |