diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-09 01:00:25 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-09 01:00:26 +0100 |
| commit | 6074ebf728668288e082cf7dca15de215cc0f653 (patch) | |
| tree | ddc25bb3fa460618353e873a8ac03db30f4950e2 /configure.json | |
| parent | 84bf4d90b7154940486d3c3969a81c259496e830 (diff) | |
| parent | 5e66ea373a581d7e62b829d0ffa7f84d754c7f8f (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I7be168303fc4fec5892f20f8dcbdf1bdfcd4986f
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.json b/configure.json index 4d8bf0f33a..d94dea850b 100644 --- a/configure.json +++ b/configure.json @@ -775,12 +775,12 @@ }, "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", - "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": { |