diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-06-07 15:12:06 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-06-08 12:54:03 +0000 |
| commit | 5f71b2220f9ff6838799c407972309bff1e8fc96 (patch) | |
| tree | 68acc01bf30f333f7d401e1217f0741069f8f6a0 | |
| parent | 2ba93a4719272c7da5cddf2d4867bf5732cf8f11 (diff) | |
Fix VS toolchain compatibility matching
VS 2017 15.0 (_MSC_VER 19.10) builds of Qt are compatible with later
Visual Studios of the same major version, e.g. VS 2017 15.7
(_MSC_VER 19.14).
Change-Id: I7635f6e2be6591245c1056045128e546c23bacd2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| -rw-r--r-- | src/app/qbs-setup-qt/setupqt.cpp | 9 |
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; } |