aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2023-03-21 10:27:47 +0100
committerChristian Kandeler <christian.kandeler@qt.io>2023-03-21 10:27:47 +0100
commit15e8faf9c7a389613423c698c1ad7a9af607b69a (patch)
tree207062680b3da8abb3414439c5aadc8658cf27ce /scripts
parent9e4054c726178dc91c2ca5b3dc1e5263eee2f043 (diff)
parent0319b0acc7a11f9ba84d8708d8e88575470ca75c (diff)
Merge 2.0 into master
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build-qbs-with-qbs.sh1
-rw-r--r--scripts/undefined-sanitizer-suppressions.txt3
2 files changed, 0 insertions, 4 deletions
diff --git a/scripts/build-qbs-with-qbs.sh b/scripts/build-qbs-with-qbs.sh
index 327d63acf..b26dcc7b5 100755
--- a/scripts/build-qbs-with-qbs.sh
+++ b/scripts/build-qbs-with-qbs.sh
@@ -44,7 +44,6 @@ set -e
# Suppress findings in some parts of Qbs / dependencies.
#
export LSAN_OPTIONS="suppressions=$( cd "$(dirname "$0")" ; pwd -P )/address-sanitizer-suppressions.txt:print_suppressions=0"
-export UBSAN_OPTIONS="suppressions=$( cd "$(dirname "$0")" ; pwd -P )/undefined-sanitizer-suppressions.txt"
if [ -z "${QBS_BUILD_PROFILE}" ]; then
QBS_BUILD_PROFILE=$(qbs config defaultProfile | cut -d: -f2 | tr -d '[:space:]')
diff --git a/scripts/undefined-sanitizer-suppressions.txt b/scripts/undefined-sanitizer-suppressions.txt
deleted file mode 100644
index 87f74533d..000000000
--- a/scripts/undefined-sanitizer-suppressions.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-shift:SymbolTable.h
-alignment:qscriptengine_p.h
-