summaryrefslogtreecommitdiff
path: root/qbs
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2022-06-13 17:28:17 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2022-06-17 15:24:00 +0000
commitd4b8739653de90e9dbbe03b8d6a3a08be5f5e9ac (patch)
tree3047763ed97b02fb5e50a28e0b01002e429364c1 /qbs
parentcdedc711825162c44e451deddbcecd47989acf14 (diff)
downloadqt-creator-d4b8739653de90e9dbbe03b8d6a3a08be5f5e9ac.tar.gz
qbs build: Fix building with MSVC and Qt >= 6.3
Change-Id: I59439217575bdcc170f38382129fa5f13edb23e2 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'qbs')
-rw-r--r--qbs/modules/qtc/qtc.qbs11
1 files changed, 11 insertions, 0 deletions
diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs
index 8578403fcc..717ebe1d9f 100644
--- a/qbs/modules/qtc/qtc.qbs
+++ b/qbs/modules/qtc/qtc.qbs
@@ -1,8 +1,11 @@
import qbs
import qbs.Environment
import qbs.FileInfo
+import qbs.Utilities
Module {
+ Depends { name: "cpp"; required: false }
+
property string qtcreator_display_version: '8.0.0-beta2'
property string ide_version_major: '7'
property string ide_version_minor: '83'
@@ -92,4 +95,12 @@ Module {
"QT_USE_QSTRINGBUILDER",
].concat(testsEnabled ? ["WITH_TESTS"] : [])
.concat(qbs.toolchain.contains("msvc") ? ["_CRT_SECURE_NO_WARNINGS"] : [])
+
+ Properties {
+ condition: cpp.present && 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-"
+ }
}