From d76eab7d2f1f43b97cfe1bbb6eaaf8734c5cb1c9 Mon Sep 17 00:00:00 2001
From: Cristian Adam <cristian.adam@qt.io>
Date: Mon, 23 May 2022 17:29:39 +0200
Subject: [PATCH] ProjectExplorer: Do not hardcode X86 architecture for Windows

On Windows Arm64 the aarch64 architecture would be overridden
by X86 and all the kits would be marked as invalid, removing
the ability to create / configure projects.

Change-Id: I3940479792aa5440e9b0ee4a63e868c01738cd90
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 src/plugins/projectexplorer/abi.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/plugins/projectexplorer/abi.cpp b/src/plugins/projectexplorer/abi.cpp
index fb9df9ef78b..2afbfa8be01 100644
--- a/src/plugins/projectexplorer/abi.cpp
+++ b/src/plugins/projectexplorer/abi.cpp
@@ -606,7 +606,8 @@ Abi Abi::abiFromTargetTriplet(const QString &triple)
         } else if (p == "mingw32" || p == "win32"
                    || p == "mingw32msvc" || p == "msys"
                    || p == "cygwin" || p == "windows") {
-            arch = X86Architecture;
+            if (arch == UnknownArchitecture)
+                arch = X86Architecture;
             os = WindowsOS;
             flavor = WindowsMSysFlavor;
             format = PEFormat;