summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Wolff <oliver.wolff@qt.io>2019-02-20 14:05:36 +0100
committerOliver Wolff <oliver.wolff@qt.io>2019-02-21 06:43:56 +0000
commit7227e54445021b8c2ce4f4ab638cc7d43e32a5a7 (patch)
tree4a11eef6ffed5ac8b2df8eac2a87d2f0eb2c94bf
parent904617dfb83f39a6a379635b64fea6fcd00f241a (diff)
qmake: Fix COPIES for Visual Studio projects
QINSTALLS is not set when Visual Studio projects are used. Use its resolved value in case that Visual Studio projects are generated. Change-Id: I8c21d4335971f45e56b3549086cb803c2d464158 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r--mkspecs/features/file_copies.prf4
1 files changed, 3 insertions, 1 deletions
diff --git a/mkspecs/features/file_copies.prf b/mkspecs/features/file_copies.prf
index 58e07bd393..8a718d8a81 100644
--- a/mkspecs/features/file_copies.prf
+++ b/mkspecs/features/file_copies.prf
@@ -44,7 +44,9 @@ for (cp, COPIES) {
$${pfx}.output = $$path/${QMAKE_FUNC_FILE_IN_qtStripSrcDir_$$cp}
}
$${pfx}.input = $${pfx}.files
- $${pfx}.commands = $(QINSTALL) ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
+ contains(TEMPLATE, "vc.*"): copycommand = $$QMAKE_QMAKE -install qinstall
+ else: copycommand = $(QINSTALL)
+ $${pfx}.commands = $$copycommand ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
$${pfx}.name = COPY ${QMAKE_FILE_IN}
$${pfx}.CONFIG = no_link no_clean target_predeps
QMAKE_EXTRA_COMPILERS += $${pfx}