diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2019-02-12 08:48:37 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-02-12 09:36:51 +0000 |
| commit | 6fcbc1a996d1726d7df5e078663a095b235d5b00 (patch) | |
| tree | 7b5eef9ae284f7fefea5fc07a168094ed89b42a0 /src | |
| parent | 6026ca22fa6ba216a82c28108792176a77404ba9 (diff) | |
Set the default platform toolset for VS 2019 to v142
Change-Id: I1fb773d9aaa527f4bead263626c604a47d9f4568
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/corelib/tools/visualstudioversioninfo.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/lib/corelib/tools/visualstudioversioninfo.cpp b/src/lib/corelib/tools/visualstudioversioninfo.cpp index 1551135bf..5383dcae0 100644 --- a/src/lib/corelib/tools/visualstudioversioninfo.cpp +++ b/src/lib/corelib/tools/visualstudioversioninfo.cpp @@ -169,9 +169,14 @@ QString VisualStudioVersionInfo::toolsVersion() const QString VisualStudioVersionInfo::platformToolsetVersion() const { - // Default PlatformToolset for VS 2017 is v141. - if (m_version.majorVersion() == 15) - return QStringLiteral("v141"); + static std::pair<int, QString> table[] = { + {16, QStringLiteral("v142")}, // VS 2019 + {15, QStringLiteral("v141")} // VS 2017 + }; + for (auto p : table) { + if (p.first == m_version.majorVersion()) + return p.second; + } return QStringLiteral("v%1").arg(m_version.majorVersion() * 10); } |