feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Abi: Handle MSVC2017 in relevant places

Browse Source 
Fixes kits forgetting the compiler.
Amends change 4c29f5fc8f.

Task-number: QTBUG-57086
Change-Id: I853dc91fd40ddbd8726fcb1a682753b163a63cf6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Friedemann Kleint
2016-11-23 09:06:44 +01:00
parent a494a84b33
commit 0a9414d467
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/projectexplorer/abi.cpp
View File

@@ -165,6 +165,8 @@ static QList<Abi> parseCoffHeader(const QByteArray &data)
break; break;
case 14: case 14:
flavor = Abi::WindowsMsvc2015Flavor; flavor = Abi::WindowsMsvc2015Flavor;
case 15:
flavor = Abi::WindowsMsvc2017Flavor;
break; break;
default: // Keep unknown flavor default: // Keep unknown flavor
if (minorLinker != 0) if (minorLinker != 0)
@@ -422,6 +424,8 @@ Abi::Abi(const QString &abiString) :
m_osFlavor = WindowsMsvc2013Flavor; m_osFlavor = WindowsMsvc2013Flavor;
else if (abiParts.at(2) == QLatin1String("msvc2015") && m_os == WindowsOS) else if (abiParts.at(2) == QLatin1String("msvc2015") && m_os == WindowsOS)
m_osFlavor = WindowsMsvc2015Flavor; m_osFlavor = WindowsMsvc2015Flavor;
else if (abiParts.at(2) == QLatin1String("msvc2017") && m_os == WindowsOS)
m_osFlavor = WindowsMsvc2017Flavor;
else if (abiParts.at(2) == QLatin1String("msys") && m_os == WindowsOS) else if (abiParts.at(2) == QLatin1String("msys") && m_os == WindowsOS)
m_osFlavor = WindowsMSysFlavor; m_osFlavor = WindowsMSysFlavor;
else if (abiParts.at(2) == QLatin1String("ce") && m_os == WindowsOS) else if (abiParts.at(2) == QLatin1String("ce") && m_os == WindowsOS)
@@ -748,6 +752,7 @@ QList<Abi::OSFlavor> Abi::flavorsForOs(const Abi::OS &o)
case WindowsOS: case WindowsOS:
return result << WindowsMsvc2005Flavor << WindowsMsvc2008Flavor << WindowsMsvc2010Flavor return result << WindowsMsvc2005Flavor << WindowsMsvc2008Flavor << WindowsMsvc2010Flavor
<< WindowsMsvc2012Flavor << WindowsMsvc2013Flavor << WindowsMsvc2015Flavor << WindowsMsvc2012Flavor << WindowsMsvc2013Flavor << WindowsMsvc2015Flavor
<< WindowsMsvc2017Flavor
<< WindowsMSysFlavor << WindowsCEFlavor << UnknownFlavor; << WindowsMSysFlavor << WindowsCEFlavor << UnknownFlavor;
case VxWorks: case VxWorks:
return result << VxWorksFlavor << UnknownFlavor; return result << VxWorksFlavor << UnknownFlavor;
@@ -768,7 +773,9 @@ Abi Abi::hostAbi()
#if defined (Q_OS_WIN) #if defined (Q_OS_WIN)
os = WindowsOS; os = WindowsOS;
#if _MSC_VER == 1900 #if _MSC_VER >= 1910
subos = WindowsMsvc2017Flavor;
#elif _MSC_VER == 1900
subos = WindowsMsvc2015Flavor; subos = WindowsMsvc2015Flavor;
#elif _MSC_VER == 1800 #elif _MSC_VER == 1800
subos = WindowsMsvc2013Flavor; subos = WindowsMsvc2013Flavor;

3
src/plugins/projectexplorer/abstractmsvctoolchain.cpp
View File

@@ -101,7 +101,8 @@ ToolChain::CompilerFlags AbstractMsvcToolChain::compilerFlags(const QStringList
case Abi::WindowsMsvc2012Flavor: flags |= StandardCxx11; case Abi::WindowsMsvc2012Flavor: flags |= StandardCxx11;
break; break;
case Abi::WindowsMsvc2013Flavor: case Abi::WindowsMsvc2013Flavor:
case Abi::WindowsMsvc2015Flavor: flags |= StandardCxx14; case Abi::WindowsMsvc2015Flavor:
case Abi::WindowsMsvc2017Flavor: flags |= StandardCxx14;
break; break;
default: default:
break; break;