From 9ceb1b504a20bff102000f1b0dac23767dd76272 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 4 Jan 2017 13:01:37 +0100 Subject: [PATCH] MSVC toolchain: Add common mkspec added in Qt 5.8.1 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 --- src/plugins/projectexplorer/msvctoolchain.cpp | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp index a2a9c64d5c6..6798f25e4f4 100644 --- a/src/plugins/projectexplorer/msvctoolchain.cpp +++ b/src/plugins/projectexplorer/msvctoolchain.cpp @@ -442,20 +442,24 @@ QString MsvcToolChain::typeDisplayName() 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()) { case Abi::WindowsMsvc2005Flavor: - return Utils::FileNameList() << Utils::FileName::fromLatin1("win32-msvc2005"); + result << Utils::FileName::fromLatin1("win32-msvc2005"); + break; case Abi::WindowsMsvc2008Flavor: - return Utils::FileNameList() << Utils::FileName::fromLatin1("win32-msvc2008"); + result << Utils::FileName::fromLatin1("win32-msvc2008"); + break; case Abi::WindowsMsvc2010Flavor: - return Utils::FileNameList() << Utils::FileName::fromLatin1("win32-msvc2010"); + result << Utils::FileName::fromLatin1("win32-msvc2010"); + break; case Abi::WindowsMsvc2012Flavor: - return Utils::FileNameList() - << Utils::FileName::fromLatin1("win32-msvc2012") + result << Utils::FileName::fromLatin1("win32-msvc2012") << Utils::FileName::fromLatin1("win32-msvc2010"); + break; case Abi::WindowsMsvc2013Flavor: - return Utils::FileNameList() - << Utils::FileName::fromLatin1("win32-msvc2013") + result << Utils::FileName::fromLatin1("win32-msvc2013") << Utils::FileName::fromLatin1("winphone-arm-msvc2013") << Utils::FileName::fromLatin1("winphone-x86-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("win32-msvc2012") << Utils::FileName::fromLatin1("win32-msvc2010"); + break; case Abi::WindowsMsvc2015Flavor: - return Utils::FileNameList() - << Utils::FileName::fromLatin1("win32-msvc2015") + result << Utils::FileName::fromLatin1("win32-msvc2015") << Utils::FileName::fromLatin1("winphone-arm-msvc2015") << Utils::FileName::fromLatin1("winphone-x86-msvc2015") << Utils::FileName::fromLatin1("winrt-arm-msvc2015") << Utils::FileName::fromLatin1("winrt-x86-msvc2015") << Utils::FileName::fromLatin1("winrt-x64-msvc2015"); + break; case Abi::WindowsMsvc2017Flavor: - return Utils::FileNameList() - << Utils::FileName::fromLatin1("win32-msvc2017"); + result << Utils::FileName::fromLatin1("win32-msvc2017"); + break; default: + result.clear(); break; } - return Utils::FileNameList(); + return result; } QVariantMap MsvcToolChain::toMap() const