diff options
| author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-05-10 10:11:17 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-05-10 10:11:57 +0200 |
| commit | 6881e1613af3e31ca3cd6b297e7756bb61d2f038 (patch) | |
| tree | 5398aaf4536d6c3f93869cf671ee0dbc42072ae1 /mkspecs/features | |
| parent | 3ae34b7ead938dc716e2fad2fa686d6867466255 (diff) | |
| parent | 7f80c96432270e0097883e11e632c14cba68da28 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I172e3e19ddcc5b7665e6c8382d725e7cc4f9794f
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 4 | ||||
| -rw-r--r-- | mkspecs/features/winrt/default_pre.prf | 2 |
2 files changed, 4 insertions, 2 deletions
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) |