From e4cb8c881f4c5e99de50a811d6cc7dd911baaa5e Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 18 Apr 2017 11:42:18 +0200 Subject: Fix installation of shader files in qtquickcontrols in non-prefix builds Use the new qmake install command to copy files around, in order to avoid the '+' trap of the Windows copy command. Task-number: QTBUG-60214 Change-Id: I7f588dbbfcdd89b7e98dbef7757944ca856815aa Reviewed-by: Oswald Buddenhagen --- mkspecs/features/file_copies.prf | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'mkspecs/features') diff --git a/mkspecs/features/file_copies.prf b/mkspecs/features/file_copies.prf index 4ebf41c78f..a3520ba549 100644 --- a/mkspecs/features/file_copies.prf +++ b/mkspecs/features/file_copies.prf @@ -45,11 +45,9 @@ for (cp, COPIES) { } $${pfx}.input = $${pfx}.files !$$dir: \ - $${pfx}.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT_PATH} - else: !copy_dir_files: \ - $${pfx}.commands = $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT_PATH} + $${pfx}.commands = $(QINSTALL_FILE) ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} else: \ - $${pfx}.commands = $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} + $${pfx}.commands = $(QINSTALL_DIR) ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} $${pfx}.name = COPY ${QMAKE_FILE_IN} $${pfx}.CONFIG = no_link no_clean target_predeps QMAKE_EXTRA_COMPILERS += $${pfx} -- cgit v1.2.3