diff options
| -rw-r--r-- | .github/workflows/main.yml | 4 | ||||
| -rw-r--r-- | scripts/address-sanitizer-suppressions.txt | 1 | ||||
| m--------- | src/shared/qtscript | 0 |
3 files changed, 3 insertions, 2 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f3ab462c9..f4f213cc1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -58,7 +58,7 @@ jobs: build-linux-extra: name: ${{ matrix.config.name }} runs-on: ubuntu-latest - timeout-minutes: 60 + timeout-minutes: 90 strategy: fail-fast: false matrix: @@ -88,7 +88,7 @@ jobs: image: 'focal-qt6', script: './scripts/build-qbs-with-qbs.sh', options: 'modules.cpp.compilerWrapper:ccache - modules.qbsbuildconfig.enableAddressSanitizer:false + products.qbsscriptengine.qbsbuildconfig.enableAddressSanitizer:false modules.qbs.debugInformation:true modules.qbsbuildconfig.enableBundledQt:true', cacheid: 'gcc-qt6', diff --git a/scripts/address-sanitizer-suppressions.txt b/scripts/address-sanitizer-suppressions.txt index f3e1980b1..b31f34a05 100644 --- a/scripts/address-sanitizer-suppressions.txt +++ b/scripts/address-sanitizer-suppressions.txt @@ -1,3 +1,4 @@ leak:libQt5Script.so.5 +leak:libqbsscriptengine.so leak:QThreadPrivate::QThreadPrivate leak:QArrayData::allocate diff --git a/src/shared/qtscript b/src/shared/qtscript -Subproject e19477e1129a4c64e023006c59878637d594e99 +Subproject 2c1ffc66bf5d5db05018d7b06253b5ca51e557a |