summaryrefslogtreecommitdiffstats
path: root/configure.json
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@qt.io>2016-11-02 17:37:31 +0100
committerOswald Buddenhagen <oswald.buddenhagen@qt.io>2016-11-07 13:02:20 +0000
commitdfbfc4915ba57294661faaa9596a92fa64893318 (patch)
tree079cc56a68a62ae154324410f58b55f448634ec0 /configure.json
parentc804033f3630cc19bde4612a5ec9fe9a897e750c (diff)
fix handling of -optimized-tools
this option makes sense only when the default build is debug (regardless of whether the release build is also enabled), as it overrides the default. Change-Id: I29f87430242a7d8239f13f0b33f6eebe098d9cf7 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'configure.json')
-rw-r--r--configure.json3
1 files changed, 2 insertions, 1 deletions
diff --git a/configure.json b/configure.json
index 0ff808519c..e266fa918c 100644
--- a/configure.json
+++ b/configure.json
@@ -558,6 +558,7 @@
},
"release_tools": {
"label": "Compile tools in release mode",
+ "autoDetect": "!features.debug",
"output": [ "privateFeature", "publicQtConfig" ]
},
"simulator_and_device": {
@@ -1073,7 +1074,7 @@ or compile needed modules into the library."
},
{
"type": "note",
- "condition": "features.release_tools && (!features.debug || features.debug_and_release)",
+ "condition": "features.release_tools && !features.debug",
"message": "-optimized-tools is not useful in -release mode."
},
{