diff --git a/.github/build-config.json b/.github/build-config.json index 38c7f48dc3b..48e5c60a668 100644 --- a/.github/build-config.json +++ b/.github/build-config.json @@ -18,7 +18,7 @@ "ndk_full_version": "27.2.12479018", "platform_workflows": "Linux,Windows,MacOS,Android", "ndk_version": "r27c", - "qt_minimum_version": "6.10.0", + "qt_minimum_version": "6.10.1", "qt_modules": "qtgraphs qtlocation qtpositioning qtspeech qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors qtscxml qtwebsockets qthttpserver", "qt_version": "6.10.3", "vulkan_sdk_version": "1.4.304.1", diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index f01dfa77c6e..c6b4c571255 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -68,15 +68,12 @@ jobs: arch: win64_msvc2022_arm64 package: QGroundControl-installer-ARM64 - # TODO: Remove qt_version override once aqtinstall supports Qt 6.10.1+ for cross-compiled ARM64 - # Workaround: Pin to Qt 6.10.0 until aqtinstall fix is released - # Tracking: https://github.com/miurahr/aqtinstall/pull/952 - variant: arm64-cross os: windows-2022 host: windows arch: win64_msvc2022_arm64_cross_compiled package: QGroundControl-installer-AMD64-ARM64 - qt_version: '6.10.0' + qt_version: '6.10.1' defaults: run: