From 20f9784881df3cdfcf05d47fb4c2394a669e39e8 Mon Sep 17 00:00:00 2001 From: DioEgizio <83089242+DioEgizio@users.noreply.github.com> Date: Mon, 29 Dec 2025 08:44:37 +0100 Subject: [PATCH] feat: Qt 6.10.1 outside macOS Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com> --- .github/actions/setup-dependencies/action.yml | 2 -- .github/workflows/build.yml | 7 ++++++- .github/workflows/codeql.yml | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/actions/setup-dependencies/action.yml b/.github/actions/setup-dependencies/action.yml index 4c19474b7..a8ecba583 100644 --- a/.github/actions/setup-dependencies/action.yml +++ b/.github/actions/setup-dependencies/action.yml @@ -21,7 +21,6 @@ inputs: qt-version: description: Version of Qt to use required: true - default: 6.9.3 outputs: build-type: @@ -78,6 +77,5 @@ runs: with: aqtversion: "==3.1.*" version: ${{ inputs.qt-version }} - arch: ${{ inputs.qt-architecture }} modules: qtimageformats qtnetworkauth cache: ${{ inputs.build-type == 'Debug' }} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0e81fd5a1..cee54b4d2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -86,6 +86,7 @@ jobs: - os: ubuntu-22.04 artifact-name: Linux cmake-preset: linux + qt-version: 6.10.1 # NOTE(@getchoo): Yes, we're intentionally using 24.04 here!!! # @@ -94,6 +95,7 @@ jobs: - os: ubuntu-24.04-arm artifact-name: Linux-aarch64 cmake-preset: linux + qt-version: 6.10.1 - os: windows-2022 artifact-name: Windows-MinGW-w64 @@ -112,16 +114,19 @@ jobs: cmake-preset: windows_msvc # TODO(@getchoo): This is the default in setup-dependencies/windows. Why isn't it working?!?! vcvars-arch: amd64 + qt-version: 6.10.1 - os: windows-11-arm artifact-name: Windows-MSVC-arm64 cmake-preset: windows_msvc vcvars-arch: arm64 + qt-version: 6.10.1 - os: macos-26 artifact-name: macOS cmake-preset: macos_universal macosx-deployment-target: 12.0 + qt-version: 6.9.3 runs-on: ${{ matrix.os }} @@ -155,7 +160,7 @@ jobs: artifact-name: ${{ matrix.artifact-name }} msystem: ${{ matrix.msystem }} vcvars-arch: ${{ matrix.vcvars-arch }} - qt-architecture: ${{ matrix.qt-architecture }} + qt-version: ${{ matrix.qt-version }} ## # BUILD diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 17b722118..8a5fa26fb 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -79,6 +79,7 @@ jobs: uses: ./.github/actions/setup-dependencies with: build-type: Debug + qt-version: 6.10.1 - name: Configure and Build run: |