From 935736b8489a14db2f0f979db37d3e07f18713eb Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 19 Dec 2019 15:50:52 +0100 Subject: MinGW: Build in release mode by default Qt 5.14.0 switched the default from -debug-and-release to -debug only. Change this to -release, like on the other platforms. [ChangeLog][MinGW] Qt will by default be built in release mode. Use -debug-or-release to force the pre 5.14.0 default. Change-Id: I020268d0672c80cdc0259068c6dc2c743a794237 Reviewed-by: Joerg Bornemann --- configure.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.json') diff --git a/configure.json b/configure.json index 23ef7625a6..644c864125 100644 --- a/configure.json +++ b/configure.json @@ -772,7 +772,7 @@ }, "debug": { "label": "Build for debugging", - "autoDetect": "features.developer-build || config.win32 || config.darwin" + "autoDetect": "features.developer-build || (config.win32 && !config.gcc) || config.darwin" }, "debug_and_release": { "label": "Compile libs in debug and release mode", -- cgit v1.2.3 From 9b4ec1393fde2af7deb39b9a2f98bcc93635603f Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 19 Dec 2019 13:12:34 +0100 Subject: 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 --- configure.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure.json') 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": { -- cgit v1.2.3