aboutsummaryrefslogtreecommitdiffstats
path: root/src/app/qbs-setup-qt/setupqt.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/app/qbs-setup-qt/setupqt.cpp')
-rw-r--r--src/app/qbs-setup-qt/setupqt.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/app/qbs-setup-qt/setupqt.cpp b/src/app/qbs-setup-qt/setupqt.cpp
index a611a8c07..097c9381a 100644
--- a/src/app/qbs-setup-qt/setupqt.cpp
+++ b/src/app/qbs-setup-qt/setupqt.cpp
@@ -392,7 +392,14 @@ static Match compatibility(const EnhancedQtEnvironment &env, const Profile &tool
// because it's especially important for this toolchain
const Version compilerVersion = Version::fromString(
toolchainProfile.value(QLatin1String("cpp.compilerVersion")).toString());
- if (env.msvcVersion.majorVersion() != compilerVersion.majorVersion()
+
+ static const Version vs2017Version{19, 10};
+ if (env.msvcVersion >= vs2017Version) {
+ if (env.msvcVersion.majorVersion() != compilerVersion.majorVersion()
+ || compilerVersion < vs2017Version) {
+ return MatchNone;
+ }
+ } else if (env.msvcVersion.majorVersion() != compilerVersion.majorVersion()
|| env.msvcVersion.minorVersion() != compilerVersion.minorVersion()) {
return MatchNone;
}