diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-05-02 14:44:44 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-05-04 09:40:48 +0000 |
| commit | 50acc8680490319c8fe45615c8d6521f0101728b (patch) | |
| tree | 6d99ba428dbc28e11adc22ed4795a3ba9fa894b6 /mkspecs/features/file_copies.prf | |
| parent | 877ef0594d94f48bf063446b1f8a4b5e1941a8cd (diff) | |
Simplify built-in qmake install command
As the directory installation command also works with files as a source
we can unify the external commands, resulting in simpler command lines.
Change-Id: I65013626eedbdb3ce1c77ed230d46edd1603b986
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'mkspecs/features/file_copies.prf')
| -rw-r--r-- | mkspecs/features/file_copies.prf | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/mkspecs/features/file_copies.prf b/mkspecs/features/file_copies.prf index a3520ba549..58e07bd393 100644 --- a/mkspecs/features/file_copies.prf +++ b/mkspecs/features/file_copies.prf @@ -44,10 +44,7 @@ for (cp, COPIES) { $${pfx}.output = $$path/${QMAKE_FUNC_FILE_IN_qtStripSrcDir_$$cp} } $${pfx}.input = $${pfx}.files - !$$dir: \ - $${pfx}.commands = $(QINSTALL_FILE) ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} - else: \ - $${pfx}.commands = $(QINSTALL_DIR) ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} + $${pfx}.commands = $(QINSTALL) ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} $${pfx}.name = COPY ${QMAKE_FILE_IN} $${pfx}.CONFIG = no_link no_clean target_predeps QMAKE_EXTRA_COMPILERS += $${pfx} |