diff options
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/file_copies.prf | 5 | ||||
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 4 | ||||
| -rw-r--r-- | mkspecs/features/winrt/default_pre.prf | 2 |
3 files changed, 5 insertions, 6 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} diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index 966c43108c..5cbc0d4bfd 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -1919,8 +1919,10 @@ qtConfCheckErrors() for (k, $${currentConfig}.features._KEYS_) { pp = $$eval($${currentConfig}.features.$${k}.purpose) !isEmpty(pp) { + pfx = $$eval($${currentConfig}.features.$${k}.section) + !isEmpty(pfx): pfx = "$$pfx: " all_ft += $$qtConfPadCols($$k, ".......................", \ - $$section(pp, $$escape_expand(\\n), 0, 0)) + $$pfx$$section(pp, $$escape_expand(\\n), 0, 0)) } } } diff --git a/mkspecs/features/winrt/default_pre.prf b/mkspecs/features/winrt/default_pre.prf index 8b9c1d7663..966d24f091 100644 --- a/mkspecs/features/winrt/default_pre.prf +++ b/mkspecs/features/winrt/default_pre.prf @@ -9,6 +9,6 @@ CONFIG(debug, debug|release): \ else: \ QMAKE_LIBS = ucrt.lib vcruntime.lib $$QMAKE_LIBS -equals(TEMPLATE, "vcapp"): CONFIG += windeployqt +equals(TEMPLATE, "vcapp"):!static: CONFIG += windeployqt load(default_pre) |