diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2023-03-21 10:27:47 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2023-03-21 10:27:47 +0100 |
| commit | 15e8faf9c7a389613423c698c1ad7a9af607b69a (patch) | |
| tree | 207062680b3da8abb3414439c5aadc8658cf27ce | |
| parent | 9e4054c726178dc91c2ca5b3dc1e5263eee2f043 (diff) | |
| parent | 0319b0acc7a11f9ba84d8708d8e88575470ca75c (diff) | |
| download | qbs-15e8faf9c7a389613423c698c1ad7a9af607b69a.tar.gz | |
Merge 2.0 into master
Change-Id: I5ec89e4f1260c8d8b669eeb94bb1fefcea9de01b
| -rw-r--r-- | .github/workflows/main.yml | 2 | ||||
| -rwxr-xr-x | scripts/build-qbs-with-qbs.sh | 1 | ||||
| -rw-r--r-- | scripts/undefined-sanitizer-suppressions.txt | 3 | ||||
| -rw-r--r-- | tests/auto/blackbox/testdata/grpc/grpc_cpp.qbs | 2 |
4 files changed, 2 insertions, 6 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a297e8ac0..80c5c0228 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -623,7 +623,7 @@ jobs: QTEST_FUNCTION_TIMEOUT: 9000000 QBS_AUTOTEST_PROFILE: 'qt' QBS_TEST_SOURCE_ROOT: 'tests' - QBS_EXTRA_GRPC_LIBS: 'absl_synchronization,gpr' + QBS_EXTRA_GRPC_LIBS: 'absl_synchronization,grpc,gpr' strategy: fail-fast: false matrix: 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 - diff --git a/tests/auto/blackbox/testdata/grpc/grpc_cpp.qbs b/tests/auto/blackbox/testdata/grpc/grpc_cpp.qbs index a7debfa07..dd2184c7e 100644 --- a/tests/auto/blackbox/testdata/grpc/grpc_cpp.qbs +++ b/tests/auto/blackbox/testdata/grpc/grpc_cpp.qbs @@ -11,7 +11,7 @@ CppApplication { } Depends { name: "cpp" } - cpp.cxxLanguageVersion: "c++14" + cpp.cxxLanguageVersion: "c++17" cpp.minimumMacosVersion: "10.8" cpp.warningLevel: "none" |