summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2022-08-11 15:24:10 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2022-08-12 08:29:06 +0000
commit58677507f8994ea99e06b41bbebdf468ab209549 (patch)
treecf9ca05b5f984740d76347d66ed052a23aa1d84a
parent1a40790d663254665b1ede86fed055edd9aeaaa9 (diff)
downloadqbs-58677507f8994ea99e06b41bbebdf468ab209549.tar.gz
Qt support: Only pull in sanitizer module if it's needed
We should not load the module unnecessarily into all Qt-based projects. Change-Id: I61a9b9eb74ea5f17d2080aa67894d839124d1dea Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
-rw-r--r--share/qbs/module-providers/Qt/templates/core.qbs4
1 files changed, 1 insertions, 3 deletions
diff --git a/share/qbs/module-providers/Qt/templates/core.qbs b/share/qbs/module-providers/Qt/templates/core.qbs
index f00f16211..137119915 100644
--- a/share/qbs/module-providers/Qt/templates/core.qbs
+++ b/share/qbs/module-providers/Qt/templates/core.qbs
@@ -18,7 +18,7 @@ Module {
&& qbs.targetPlatform === targetPlatform + "-simulator"
Depends { name: "cpp" }
- Depends { name: "Sanitizers.address" }
+ Depends { name: "Sanitizers.address"; condition: config.contains("sanitize_address") }
Depends { name: "Qt.android_support"; condition: qbs.targetOS.contains("android") }
Properties {
@@ -121,8 +121,6 @@ Module {
property stringList moduleConfig: @moduleConfig@
- Sanitizers.address.enabled: config.contains("sanitize_address")
-
Properties {
condition: moduleConfig.contains("use_gold_linker")
cpp.linkerVariant: "gold"