From b88e9ba9b574c015b62a5c274eb2a4fb889bed55 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Wed, 12 Jan 2022 17:22:32 +0100
Subject: [PATCH] ProjectExplorer: Consider MSVC 2022 as base for clang-cl

Amends 08b6e0239f.

Fixes: QTCREATORBUG-26721
Change-Id: I04d65a39c6d7001081d748ca5f15361e30e2fc50
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 src/plugins/projectexplorer/msvctoolchain.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp
index ec0bfdcfdcc..c352bba893b 100644
--- a/src/plugins/projectexplorer/msvctoolchain.cpp
+++ b/src/plugins/projectexplorer/msvctoolchain.cpp
@@ -1572,7 +1572,9 @@ static const MsvcToolChain *selectMsvcToolChain(const QString &displayedVarsBat,
     QTC_CHECK(displayedVarsBat.isEmpty());
     const QVersionNumber version = clangClVersion(clangClPath);
     if (version.majorVersion() >= 6) {
-        toolChain = findMsvcToolChain(wordWidth, Abi::WindowsMsvc2019Flavor);
+        toolChain = findMsvcToolChain(wordWidth, Abi::WindowsMsvc2022Flavor);
+        if (!toolChain)
+            toolChain = findMsvcToolChain(wordWidth, Abi::WindowsMsvc2019Flavor);
         if (!toolChain)
             toolChain = findMsvcToolChain(wordWidth, Abi::WindowsMsvc2017Flavor);
     }