From 85b5845ebb1d0b0f54b80e73a04b2898e182041d Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Sun, 10 Sep 2023 18:43:51 -0500
Subject: [PATCH] Switch to Qt 6.5 for Windows ARM64 build

---
 appveyor.yml                    |  2 +-
 scripts/appveyor/target_qt.conf | 19 ++++++++++++++++---
 scripts/build-arch.bat          | 20 +++++++++++++++-----
 3 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 53f21808..e3836aa6 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,7 +6,7 @@ environment:
   matrix:
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
       QTDIR: C:\Qt\5.15
-      QTDIR_ARM64: C:\Qt\6.4.3
+      QTDIR_ARM64: C:\Qt\6.5
     - APPVEYOR_BUILD_WORKER_IMAGE: macOS-Monterey
       BUILD_TARGET: macos
     - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu1604
diff --git a/scripts/appveyor/target_qt.conf b/scripts/appveyor/target_qt.conf
index 97f4f42e..cd09ec1e 100644
--- a/scripts/appveyor/target_qt.conf
+++ b/scripts/appveyor/target_qt.conf
@@ -1,7 +1,20 @@
 [DevicePaths]
-Prefix=C:/Qt/Qt-6.4.3
+Prefix=C:/Qt/Qt-6.5
 [Paths]
 Prefix=../
+Documentation=./doc
+Headers=include
+Libraries=lib
+LibraryExecutables=./bin
+Binaries=bin
+Plugins=./plugins
+QmlImports=./qml
+ArchData=.
+Data=.
+Translations=./translations
+Examples=examples
+Tests=tests
+Settings=etc/xdg
 HostPrefix=../../msvc2019_64
 HostBinaries=bin
 HostLibraries=lib
@@ -11,5 +24,5 @@ Sysroot=
 SysrootifyPrefix=false
 TargetSpec=win32-arm64-msvc
 HostSpec=
-Documentation=../../Docs/Qt-6.4.3
-Examples=../../Examples/Qt-6.4.3
\ No newline at end of file
+Documentation=../../Docs/Qt-6.5
+Examples=../../Examples/Qt-6.5
\ No newline at end of file
diff --git a/scripts/build-arch.bat b/scripts/build-arch.bat
index 7151796e..bd357f8e 100644
--- a/scripts/build-arch.bat
+++ b/scripts/build-arch.bat
@@ -192,8 +192,16 @@ echo Copying qt.conf
 copy %SOURCE_ROOT%\app\qt.conf %DEPLOY_FOLDER%
 if !ERRORLEVEL! NEQ 0 goto Error
 
+if not x%QT_PATH:\5.=%==x%QT_PATH% (
+    rem Qt 5.15
+    set WINDEPLOYQT_ARGS=--no-qmltooling --no-virtualkeyboard
+) else (
+    rem Qt 6.5
+    set WINDEPLOYQT_ARGS=--no-system-d3d-compiler --skip-plugin-types qmltooling,generic
+)
+
 echo Deploying Qt dependencies
-%WINDEPLOYQT_CMD% --dir %DEPLOY_FOLDER% --%BUILD_CONFIG% --qmldir %SOURCE_ROOT%\app\gui --no-opengl-sw --no-compiler-runtime --no-qmltooling --no-virtualkeyboard --no-sql %BUILD_FOLDER%\app\%BUILD_CONFIG%\Moonlight.exe
+%WINDEPLOYQT_CMD% --dir %DEPLOY_FOLDER% --%BUILD_CONFIG% --qmldir %SOURCE_ROOT%\app\gui --no-opengl-sw --no-compiler-runtime --no-sql %WINDEPLOYQT_ARGS% %BUILD_FOLDER%\app\%BUILD_CONFIG%\Moonlight.exe
 if !ERRORLEVEL! NEQ 0 goto Error
 
 echo Deleting unused styles
@@ -201,10 +209,12 @@ rem Qt 5.x directories
 rmdir /s /q %DEPLOY_FOLDER%\QtQuick\Controls.2\Fusion
 rmdir /s /q %DEPLOY_FOLDER%\QtQuick\Controls.2\Imagine
 rmdir /s /q %DEPLOY_FOLDER%\QtQuick\Controls.2\Universal
-rem Qt 6.x directories
-rmdir /s /q %DEPLOY_FOLDER%\QtQuick\Controls\Fusion
-rmdir /s /q %DEPLOY_FOLDER%\QtQuick\Controls\Imagine
-rmdir /s /q %DEPLOY_FOLDER%\QtQuick\Controls\Universal
+rem Qt 6.5+ directories
+rmdir /s /q %DEPLOY_FOLDER%\qml\QtQuick\Controls\Fusion
+rmdir /s /q %DEPLOY_FOLDER%\qml\QtQuick\Controls\Imagine
+rmdir /s /q %DEPLOY_FOLDER%\qml\QtQuick\Controls\Universal
+rmdir /s /q %DEPLOY_FOLDER%\qml\QtQuick\Controls\Windows
+rmdir /s /q %DEPLOY_FOLDER%\qml\QtQuick\NativeStyle
 
 if "%SIGN%"=="1" (
     echo Signing deployed binaries