aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2018-11-14 14:22:24 +0100
committerJoerg Bornemann <joerg.bornemann@qt.io>2018-11-15 07:01:34 +0000
commit9b7be5fca8dbe6be51c3a869ca1700b96ceada5b (patch)
treeeabc97355cec976f229644aa94c7510240dd5231
parentbc657e9cedef4c372e319d2cb4490298d2ffa0b8 (diff)
Fix PlatformToolset for VS 2017 projectsv1.12.2
The default "platform toolset" is v141, while the VS major version is 15. This case is now hardcoded, because I fail to see a pattern in this nonsense, sorry. Task-number: QBS-1371 Change-Id: I69194a6cbbd072d364b13e69178363bd90632346 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--src/lib/corelib/tools/visualstudioversioninfo.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/lib/corelib/tools/visualstudioversioninfo.cpp b/src/lib/corelib/tools/visualstudioversioninfo.cpp
index 5ae9ab6fd..1551135bf 100644
--- a/src/lib/corelib/tools/visualstudioversioninfo.cpp
+++ b/src/lib/corelib/tools/visualstudioversioninfo.cpp
@@ -169,6 +169,9 @@ QString VisualStudioVersionInfo::toolsVersion() const
QString VisualStudioVersionInfo::platformToolsetVersion() const
{
+ // Default PlatformToolset for VS 2017 is v141.
+ if (m_version.majorVersion() == 15)
+ return QStringLiteral("v141");
return QStringLiteral("v%1").arg(m_version.majorVersion() * 10);
}