summaryrefslogtreecommitdiffstats
path: root/src/buildtools
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2020-05-22 12:05:04 +0200
committerMichal Klocek <michal.klocek@qt.io>2020-05-28 18:54:01 +0200
commit626c46ab34b201cbec6c86b183d0047062d9bb76 (patch)
tree142f28b0bdd612a87fe5d3f8e0c74b53c49d083c /src/buildtools
parent1b80f4d302011ee05691ef873b9d2ba430c2acf3 (diff)
Move sanitizer to buildtools
Change-Id: I1531199bb15b9d05e5c017d14fce07d39625cafe Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/buildtools')
-rw-r--r--src/buildtools/configure.json16
1 files changed, 16 insertions, 0 deletions
diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json
index 135e0efce..6c9f09286 100644
--- a/src/buildtools/configure.json
+++ b/src/buildtools/configure.json
@@ -348,6 +348,10 @@
"webengine-arm-thumb" : {
"label": "thumb instruction set",
"type": "hasThumbFlag"
+ },
+ "webengine-sanitizer": {
+ "label" : "sanitizer support",
+ "type": "isSanitizerSupported"
}
},
"features": {
@@ -364,6 +368,7 @@
&& features.webengine-python2
&& !config.static
&& !config.ios
+ && (!config.sanitizer || features.webengine-sanitizer)
&& (!config.linux || features.pkg-config)
&& (!config.linux || features.webengine-host-pkg-config)
&& (!config.linux || features.webengine-system-glibc)
@@ -658,6 +663,12 @@
"label": "Thumb instruction set",
"condition": "config.linux && arch.arm && tests.webengine-arm-thumb",
"output": [ "privateFeature" ]
+ },
+ "webengine-sanitizer" : {
+ "label": "Sanitizer",
+ "autoDetect": "config.sanitizer && tests.webengine-sanitizer",
+ "condition": "config.sanitizer",
+ "output": [ "privateFeature" ]
}
},
"report": [
@@ -705,6 +716,11 @@
},
"webengine-developer-build",
{
+ "type": "feature",
+ "args": "webengine-sanitizer",
+ "condition": "!config.sanitizer"
+ },
+ {
"section": "QtWebEngine required system libraries",
"condition": "config.unix && !config.macos && !config.ios",
"entries": [