summaryrefslogtreecommitdiffstats
path: root/configure.json
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2017-12-14 12:45:44 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-01-10 17:09:18 +0000
commit0b406584b711e5c6e12baeb15e10045f02914af4 (patch)
tree001ae66482f34f58c557fbb166c72cca7fec2d93 /configure.json
parent8c4904e6079aa54dded654f8617e0f85a33aa6e1 (diff)
Fix sanitizer build
Task-number: QTBUG-64726 Change-Id: Ic88eed62e85ad1d95afcbd154c6556509e42bd47 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'configure.json')
-rw-r--r--configure.json12
1 files changed, 11 insertions, 1 deletions
diff --git a/configure.json b/configure.json
index 398df0ce9..7ef1f5003 100644
--- a/configure.json
+++ b/configure.json
@@ -534,7 +534,7 @@
"output": [ "privateFeature" ]
},
"webengine-sanitizer" : {
- "label": "Sanitizer ",
+ "label": "Sanitizer",
"autoDetect": "config.sanitizer && tests.webengine-sanitizer",
"condition": "config.sanitizer",
"output": [ "privateFeature" ]
@@ -561,6 +561,11 @@
"type": "warning",
"condition": "!features.webengine-flex",
"message": "flex is required to build QtWebEngine."
+ },
+ {
+ "type": "warning",
+ "condition": "config.sanitizer && !tests.webengine-sanitizer && !features.webengine-sanitizer",
+ "message": "Qt WebEngine cannot be built with the chosen sanitizer configuration. Check config.log for details or use -feature-webengine-sanitizer to force the build."
}
],
@@ -588,6 +593,11 @@
"condition": "config.unix"
},
{
+ "type": "feature",
+ "args": "webengine-sanitizer",
+ "condition": "config.sanitizer"
+ },
+ {
"section": "Optional system libraries used",
"condition": "config.unix",
"entries": [