From db2f2f92b6349fc0d8549ae01ab38613963c3f89 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Mon, 22 Jun 2020 17:32:37 +0200
Subject: [PATCH] Clang-cl: Consider MSVC 2019

Fixes: QTCREATORBUG-24167
Change-Id: Iff6e98c5cb404c67dce796ad6f7225f97caa4184
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 src/plugins/projectexplorer/msvctoolchain.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp
index 29a0bdd2ff3..4b2027896f5 100644
--- a/src/plugins/projectexplorer/msvctoolchain.cpp
+++ b/src/plugins/projectexplorer/msvctoolchain.cpp
@@ -1517,8 +1517,11 @@ static const MsvcToolChain *selectMsvcToolChain(const QString &displayedVarsBat,
 
     QTC_CHECK(displayedVarsBat.isEmpty());
     const QVersionNumber version = clangClVersion(clangClPath);
-    if (version.majorVersion() >= 6)
-        toolChain = findMsvcToolChain(wordWidth, Abi::WindowsMsvc2017Flavor);
+    if (version.majorVersion() >= 6) {
+        toolChain = findMsvcToolChain(wordWidth, Abi::WindowsMsvc2019Flavor);
+        if (!toolChain)
+            toolChain = findMsvcToolChain(wordWidth, Abi::WindowsMsvc2017Flavor);
+    }
     if (!toolChain) {
         toolChain = findMsvcToolChain(wordWidth, Abi::WindowsMsvc2015Flavor);
         if (!toolChain)