summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.json2
-rw-r--r--configure.pri13
2 files changed, 14 insertions, 1 deletions
diff --git a/configure.json b/configure.json
index c73369e6f6..a6f3ed66a9 100644
--- a/configure.json
+++ b/configure.json
@@ -867,7 +867,7 @@
"sanitizer": {
"label": "Sanitizers",
"condition": "features.sanitize_address || features.sanitize_thread || features.sanitize_memory || features.sanitize_undefined",
- "output": [ "publicConfig" ]
+ "output": [ "sanitizer", "publicConfig" ]
},
"GNUmake": {
"label": "GNU make",
diff --git a/configure.pri b/configure.pri
index 83c0dee141..021cc1bd1e 100644
--- a/configure.pri
+++ b/configure.pri
@@ -876,6 +876,19 @@ defineTest(qtConfOutput_shared) {
export(CONFIG)
}
+defineTest(qtConfOutput_sanitizer) {
+ !$${2}: return()
+
+ # Export this here, so that WebEngine can access it at configure time.
+ CONFIG += sanitizer
+ $$qtConfEvaluate("features.sanitize_address"): CONFIG += sanitize_address
+ $$qtConfEvaluate("features.sanitize_thread"): CONFIG += sanitize_thread
+ $$qtConfEvaluate("features.sanitize_memory"): CONFIG += sanitize_memory
+ $$qtConfEvaluate("features.sanitize_undefined"): CONFIG += sanitize_undefined
+
+ export(CONFIG)
+}
+
defineTest(qtConfOutput_architecture) {
arch = $$qtConfEvaluate("tests.architecture.arch")
buildabi = $$qtConfEvaluate("tests.architecture.buildabi")