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

Clang-cl: Consider MSVC 2019

Browse Source 
Fixes: QTCREATORBUG-24167
Change-Id: Iff6e98c5cb404c67dce796ad6f7225f97caa4184
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Kandeler
2020-06-22 17:32:37 +02:00
parent 832eb5c5a3
commit db2f2f92b6
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1517,8 +1517,11 @@ static const MsvcToolChain *selectMsvcToolChain(const QString &displayedVarsBat,
QTC_CHECK(displayedVarsBat.isEmpty()); QTC_CHECK(displayedVarsBat.isEmpty());
const QVersionNumber version = clangClVersion(clangClPath); const QVersionNumber version = clangClVersion(clangClPath);
if (version.majorVersion() >= 6) if (version.majorVersion() >= 6) {
toolChain = findMsvcToolChain(wordWidth, Abi::WindowsMsvc2017Flavor); toolChain = findMsvcToolChain(wordWidth, Abi::WindowsMsvc2019Flavor);
if (!toolChain)
toolChain = findMsvcToolChain(wordWidth, Abi::WindowsMsvc2017Flavor);
}
if (!toolChain) { if (!toolChain) {
toolChain = findMsvcToolChain(wordWidth, Abi::WindowsMsvc2015Flavor); toolChain = findMsvcToolChain(wordWidth, Abi::WindowsMsvc2015Flavor);
if (!toolChain) if (!toolChain)