summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2019-12-19 13:12:34 +0100
committerKai Koehne <kai.koehne@qt.io>2020-01-06 12:58:16 +0100
commit9b4ec1393fde2af7deb39b9a2f98bcc93635603f (patch)
treee3016aded72403a59a55f79103823fde8c7e76ef
parent935736b8489a14db2f0f979db37d3e07f18713eb (diff)
MinGW: Allow debug-and-release builds
Commit 4d289edb14aeb49 did disable debug-and-release for MinGW completely. While it makes sense to change the default, we should allow people to opt-in to old behavior by explicitly setting '-debug-and-release'. To allow differentiation between debug and release libraries debug dll's (again) have a 'd' suffix. Fixes: QTBUG-80792 Change-Id: I341b1a94788f490e975be6736159980cd9273f08 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r--configure.json4
-rw-r--r--mkspecs/features/qt_functions.prf2
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.json b/configure.json
index 644c864125..1ae09ef386 100644
--- a/configure.json
+++ b/configure.json
@@ -776,8 +776,8 @@
},
"debug_and_release": {
"label": "Compile libs in debug and release mode",
- "autoDetect": "input.debug == ''",
- "condition": "config.darwin || (config.win32 && !config.gcc)",
+ "autoDetect": "input.debug == '' && !(config.win32 && config.gcc)",
+ "condition": "config.darwin || config.win32",
"output": [ "publicFeature", "publicQtConfig", "debugAndRelease" ]
},
"force_debug_info": {
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index 661b7dd961..45d4492788 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -5,7 +5,7 @@ defineReplace(qtPlatformTargetSuffix) {
else: CONFIG(debug, debug|release) {
!debug_and_release|build_pass {
mac: return($${suffix}_debug)
- win32:!gcc: return($${suffix}d)
+ win32: return($${suffix}d)
}
}
return($$suffix)