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

ProjectExplorer: Fix clang ABI detection

Browse Source 
Change-Id: I809f8b747ffb64ed128fd0f957d13d670604d050
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Orgad Shaneh
2017-04-06 16:25:16 +03:00
committed by Orgad Shaneh
parent 5828205418
commit d186d85bcf
3 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -789,6 +789,28 @@ QList<Abi::OSFlavor> Abi::flavorsForOs(const Abi::OS &o)
return result;
}
Abi::OSFlavor Abi::flavorForMsvcVersion(int version)
{
if (version >= 1910)
return WindowsMsvc2017Flavor;
switch (version) {
case 1900:
return WindowsMsvc2015Flavor;
case 1800:
return WindowsMsvc2013Flavor;
case 1700:
return WindowsMsvc2012Flavor;
case 1600:
return WindowsMsvc2010Flavor;
case 1500:
return WindowsMsvc2008Flavor;
case 1400:
return WindowsMsvc2005Flavor;
default:
return WindowsMSysFlavor;
}
}
Abi Abi::hostAbi()
{
Architecture arch = QTC_CPU; // define set by qmake
@@ -798,20 +820,8 @@ Abi Abi::hostAbi()
#if defined (Q_OS_WIN)
os = WindowsOS;
#if _MSC_VER >= 1910
subos = WindowsMsvc2017Flavor;
#elif _MSC_VER == 1900
subos = WindowsMsvc2015Flavor;
#elif _MSC_VER == 1800
subos = WindowsMsvc2013Flavor;
#elif _MSC_VER == 1700
subos = WindowsMsvc2012Flavor;
#elif _MSC_VER == 1600
subos = WindowsMsvc2010Flavor;
#elif _MSC_VER == 1500
subos = WindowsMsvc2008Flavor;
#elif _MSC_VER == 1400
subos = WindowsMsvc2005Flavor;
#ifdef _MSC_VER
subos = flavorForMsvcVersion(_MSC_VER);
#elif defined (Q_CC_MINGW)
subos = WindowsMSysFlavor;
#endif