diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2022-06-01 17:48:08 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2022-06-03 07:15:57 +0000 |
| commit | 2a0ddd654903a2dac1b73a7929e49646e4bb676a (patch) | |
| tree | 8d986424185ea1ae8bdf014f89719fd580af653d | |
| parent | 2687b36742b00679726a151a7b10e4756d3dc910 (diff) | |
Qt support: Add /permissive- flag with MSVC
This is required for user applications as of
qtbase/0dc6cc055174a0556f2e41ca269013b3a7056c86.
Also update our own build system files accordingly.
Change-Id: Ibc640555cdf0cae6e0c5353b2f5d99af4475b510
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| -rw-r--r-- | qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs | 7 | ||||
| -rw-r--r-- | share/qbs/module-providers/Qt/templates/core.qbs | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs b/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs index 7a7bd1462..4a50298fd 100644 --- a/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs +++ b/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs @@ -75,4 +75,11 @@ Module { return flags; } } + Properties { + condition: project.withCode && qbs.toolchain.contains("msvc") && product.Qt + && Utilities.versionCompare(Qt.core.version, "6.3") >= 0 + && Utilities.versionCompare(cpp.compilerVersion, "19.10") >= 0 + && Utilities.versionCompare(qbs.version, "1.23") < 0 + cpp.cxxFlags: "/permissive-" + } } diff --git a/share/qbs/module-providers/Qt/templates/core.qbs b/share/qbs/module-providers/Qt/templates/core.qbs index 50d68d3a1..c3c68164f 100644 --- a/share/qbs/module-providers/Qt/templates/core.qbs +++ b/share/qbs/module-providers/Qt/templates/core.qbs @@ -206,8 +206,11 @@ Module { if (qbs.toolchain.contains('msvc')) { if (versionMajor < 5) flags.push('/Zc:wchar_t-'); + if (Utilities.versionCompare(version, "6.3") >= 0 + && Utilities.versionCompare(cpp.compilerVersion, "19.10") >= 0) { + flags.push("/permissive-"); + } } - return flags; } cpp.cxxStandardLibrary: { |