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

MSVC toolchain: Add common mkspec added in Qt 5.8.1

Browse Source 
Prepend "win32-msvc" to the result list. Projects based
on Qt 5.8.1 will then no longer be misconfigured with ARM
toolchains.

Change-Id: I734ee530e4fe2c5253f946568c2ab973e51d3cae
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Friedemann Kleint
2017-01-04 13:01:37 +01:00
parent be4d1093b4
commit 9ceb1b504a
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/plugins/projectexplorer/msvctoolchain.cpp
View File

@@ -442,20 +442,24 @@ QString MsvcToolChain::typeDisplayName() const
Utils::FileNameList MsvcToolChain::suggestedMkspecList() const Utils::FileNameList MsvcToolChain::suggestedMkspecList() const
{ {
Utils::FileNameList result;
result << Utils::FileName::fromLatin1("win32-msvc"); // Common MSVC mkspec introduced in 5.8.1
switch (m_abi.osFlavor()) { switch (m_abi.osFlavor()) {
case Abi::WindowsMsvc2005Flavor: case Abi::WindowsMsvc2005Flavor:
return Utils::FileNameList() << Utils::FileName::fromLatin1("win32-msvc2005"); result << Utils::FileName::fromLatin1("win32-msvc2005");
break;
case Abi::WindowsMsvc2008Flavor: case Abi::WindowsMsvc2008Flavor:
return Utils::FileNameList() << Utils::FileName::fromLatin1("win32-msvc2008"); result << Utils::FileName::fromLatin1("win32-msvc2008");
break;
case Abi::WindowsMsvc2010Flavor: case Abi::WindowsMsvc2010Flavor:
return Utils::FileNameList() << Utils::FileName::fromLatin1("win32-msvc2010"); result << Utils::FileName::fromLatin1("win32-msvc2010");
break;
case Abi::WindowsMsvc2012Flavor: case Abi::WindowsMsvc2012Flavor:
return Utils::FileNameList() result << Utils::FileName::fromLatin1("win32-msvc2012")
<< Utils::FileName::fromLatin1("win32-msvc2012")
<< Utils::FileName::fromLatin1("win32-msvc2010"); << Utils::FileName::fromLatin1("win32-msvc2010");
break;
case Abi::WindowsMsvc2013Flavor: case Abi::WindowsMsvc2013Flavor:
return Utils::FileNameList() result << Utils::FileName::fromLatin1("win32-msvc2013")
<< Utils::FileName::fromLatin1("win32-msvc2013")
<< Utils::FileName::fromLatin1("winphone-arm-msvc2013") << Utils::FileName::fromLatin1("winphone-arm-msvc2013")
<< Utils::FileName::fromLatin1("winphone-x86-msvc2013") << Utils::FileName::fromLatin1("winphone-x86-msvc2013")
<< Utils::FileName::fromLatin1("winrt-arm-msvc2013") << Utils::FileName::fromLatin1("winrt-arm-msvc2013")
@@ -463,21 +467,23 @@ Utils::FileNameList MsvcToolChain::suggestedMkspecList() const
<< Utils::FileName::fromLatin1("winrt-x64-msvc2013") << Utils::FileName::fromLatin1("winrt-x64-msvc2013")
<< Utils::FileName::fromLatin1("win32-msvc2012") << Utils::FileName::fromLatin1("win32-msvc2012")
<< Utils::FileName::fromLatin1("win32-msvc2010"); << Utils::FileName::fromLatin1("win32-msvc2010");
break;
case Abi::WindowsMsvc2015Flavor: case Abi::WindowsMsvc2015Flavor:
return Utils::FileNameList() result << Utils::FileName::fromLatin1("win32-msvc2015")
<< Utils::FileName::fromLatin1("win32-msvc2015")
<< Utils::FileName::fromLatin1("winphone-arm-msvc2015") << Utils::FileName::fromLatin1("winphone-arm-msvc2015")
<< Utils::FileName::fromLatin1("winphone-x86-msvc2015") << Utils::FileName::fromLatin1("winphone-x86-msvc2015")
<< Utils::FileName::fromLatin1("winrt-arm-msvc2015") << Utils::FileName::fromLatin1("winrt-arm-msvc2015")
<< Utils::FileName::fromLatin1("winrt-x86-msvc2015") << Utils::FileName::fromLatin1("winrt-x86-msvc2015")
<< Utils::FileName::fromLatin1("winrt-x64-msvc2015"); << Utils::FileName::fromLatin1("winrt-x64-msvc2015");
break;
case Abi::WindowsMsvc2017Flavor: case Abi::WindowsMsvc2017Flavor:
return Utils::FileNameList() result << Utils::FileName::fromLatin1("win32-msvc2017");
<< Utils::FileName::fromLatin1("win32-msvc2017"); break;
default: default:
result.clear();
break; break;
} }
return Utils::FileNameList(); return result;
} }
QVariantMap MsvcToolChain::toMap() const QVariantMap MsvcToolChain::toMap() const