From 50d74a7b7a3640835ee04418aec7931304ec1c9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?=
 <luisangelsm@gmail.com>
Date: Mon, 31 Mar 2025 21:33:54 +0200
Subject: [PATCH] Update the architecture spec for aqtinstall when trying to
 cross compile for arm64

---
 azure-pipelines-windows-template-qt6-arm64.yml | 4 ++--
 azure-pipelines.yml                            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/azure-pipelines-windows-template-qt6-arm64.yml b/azure-pipelines-windows-template-qt6-arm64.yml
index 23c9a425..b189d70d 100644
--- a/azure-pipelines-windows-template-qt6-arm64.yml
+++ b/azure-pipelines-windows-template-qt6-arm64.yml
@@ -3,7 +3,7 @@ parameters:
   architecture: 'arm64'
   qt_version: '6.8.1'
   qt_spec: 'msvc2022_arm64'
-  qt_aqt_spec: 'win64_msvc2022_arm64'
+  qt_aqt_spec: 'win64_msvc2022_arm64_cross_compiled'
   vc_redist_url: 'https://aka.ms/vs/17/release/vc_redist.arm64.exe'
   vc_redist_file_name: 'vc_redist.arm64.exe'
   vc_vars: 'vcvarsall.bat'
@@ -26,7 +26,7 @@ jobs:
       pip install aqtinstall
       mkdir C:\Qt  
       python -m aqt install-qt windows desktop ${{ parameters.qt_version }} win64_msvc2022_64 -O c:\Qt -m qt5compat qtmultimedia qtimageformats qtshadertools
-      python -m aqt install-qt windows desktop ${{ parameters.qt_version }} ${{ parameters.qt_aqt_spec }} -O c:\Qt
+      python -m aqt install-qt windows desktop ${{ parameters.qt_version }} ${{ parameters.qt_aqt_spec }} -O c:\Qt -m qt5compat qtmultimedia qtimageformats qtshadertools
       dir C:\Qt\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\bin
       choco install -y wget
       choco install innosetup
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d3333d20..bf352ac4 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -297,7 +297,7 @@ jobs:
     architecture: 'arm64'
     qt_version: '6.8.1'
     qt_spec: 'msvc2022_arm64'
-    qt_aqt_spec: 'win64_msvc2022_arm64'
+    qt_aqt_spec: 'win64_msvc2022_arm64_cross_compiled'
     vc_redist_url: 'https://aka.ms/vs/17/release/vc_redist.arm64.exe'
     vc_redist_file_name: 'vc_redist.arm64.exe'
     vc_vars: 'vcvarsall.bat'