diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-07 01:01:16 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-07 01:01:16 +0100 |
| commit | c75e8a661852952b12da95c48ad2c1b88e6cf7e1 (patch) | |
| tree | 5a32acf6e2fa4a6500372aa0c94b70b112a3f1c7 /configure.json | |
| parent | 68c30e372b01561e8809fcfa5426ae896da70b8e (diff) | |
| parent | 1535fc9fb9ddbfce1680979c0634b4fdf8d75fca (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I6c81e3cb6272adc5c3de2513792bd48604ff4dd0
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 30c5dd0420..1e8506f54d 100644 --- a/configure.json +++ b/configure.json @@ -776,12 +776,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": { |