diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2023-09-15 11:16:52 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2023-09-15 11:16:52 +0200 |
| commit | 468647290323778cf2e1bb55de6021644d4c6277 (patch) | |
| tree | c0822af716c1270c7463dfd3e09fd1ffebb5fc38 | |
| parent | 97d763884f6d04fe819f1309ac6a639875c7bed1 (diff) | |
| parent | d361630f727459ea6dccc1ca6cd5ad51162bfb62 (diff) | |
Merge 2.1 into master
Change-Id: Ic03c526f407d44d7d889a6a0a23c5e79795999b9
| -rw-r--r-- | changelogs/changes-2.1.2.md | 3 | ||||
| -rw-r--r-- | share/qbs/module-providers/Qt/templates/core.qbs | 2 | ||||
| -rw-r--r-- | share/qbs/modules/Sanitizers/address/asan.qbs | 3 |
3 files changed, 7 insertions, 1 deletions
diff --git a/changelogs/changes-2.1.2.md b/changelogs/changes-2.1.2.md index 7b059e10d..b83ecdbf5 100644 --- a/changelogs/changes-2.1.2.md +++ b/changelogs/changes-2.1.2.md @@ -3,6 +3,9 @@ * Fixed scope pollution and potential crash when assigning to provider properties (QBS-1747). * Fixed potential access to freed JSValues (QBS-1751). +# Qt +* Fixed building against Qt with "profiling" build variant (QBS-1758). + # Apple * Fixed bundle module with Xcode-less profiles. * Fixed ApplicationExtension with Xcode-less profiles. diff --git a/share/qbs/module-providers/Qt/templates/core.qbs b/share/qbs/module-providers/Qt/templates/core.qbs index b980588ff..ca978eae5 100644 --- a/share/qbs/module-providers/Qt/templates/core.qbs +++ b/share/qbs/module-providers/Qt/templates/core.qbs @@ -76,6 +76,8 @@ Module { property string qtBuildVariant: { if (availableBuildVariants.contains(qbs.buildVariant)) return qbs.buildVariant; + if (qbs.buildVariant === "profiling" && availableBuildVariants.contains("release")) + return "release"; return availableBuildVariants.length > 0 ? availableBuildVariants[0] : ""; } diff --git a/share/qbs/modules/Sanitizers/address/asan.qbs b/share/qbs/modules/Sanitizers/address/asan.qbs index 9ae6f285e..9d8f5b97e 100644 --- a/share/qbs/modules/Sanitizers/address/asan.qbs +++ b/share/qbs/modules/Sanitizers/address/asan.qbs @@ -64,7 +64,8 @@ Module { flags.push("-fsanitize-address-use-after-scope"); if (detectUseAfterReturn) { if (qbs.toolchain.includes("llvm")) { - if (Utilities.versionCompare(cpp.compilerVersion, "13") >= 0) + var minVersion = qbs.toolchain.contains("xcode") ? "14" : "13"; + if (Utilities.versionCompare(cpp.compilerVersion, minVersion) >= 0) flags.push("-fsanitize-address-use-after-return=" + detectUseAfterReturn); } else if (detectUseAfterReturn === "never") { flags.push("--param", "asan-use-after-return=0"); |