From 32caaacee374ade688e8d91a303d4c2c16cffcaa Mon Sep 17 00:00:00 2001
From: Oliver Wolff <oliver.wolff@qt.io>
Date: Tue, 4 Jan 2022 06:18:44 +0100
Subject: [PATCH] windows arm64: Use correct Q_PROCESSOR_ARM_64 define check
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Inclusion of qt_windows.h is needed to avoid  "No Target Architecture"
in winnt.h.

Change-Id: Ic67ce8a306ef52c4ce3e6eaad0b7864632610737
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
---
 src/corelib/global/qsimd.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/corelib/global/qsimd.cpp b/src/corelib/global/qsimd.cpp
index 025c50b6e8a..b96a67b14bc 100644
--- a/src/corelib/global/qsimd.cpp
+++ b/src/corelib/global/qsimd.cpp
@@ -54,7 +54,8 @@
 #  if !defined(Q_CC_GNU)
 #    include <intrin.h>
 #  endif
-#  if defined(Q_PROCESSOR_ARM64)
+#  if defined(Q_PROCESSOR_ARM_64)
+#    include <qt_windows.h>
 #    include <processthreadsapi.h>
 #  endif
 #elif defined(Q_OS_LINUX) && defined(Q_PROCESSOR_MIPS_32)
@@ -166,7 +167,7 @@ static inline quint64 detectProcessorFeatures()
     features |= CpuFeatureAES;
 #endif
     return features;
-#elif defined(Q_OS_WIN) && defined(Q_PROCESSOR_ARM64)
+#elif defined(Q_OS_WIN) && defined(Q_PROCESSOR_ARM_64)
     features |= CpuFeatureNEON;
     if (IsProcessorFeaturePresent(PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE) != 0)
         features |= CpuFeatureCRC32;