diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d83963b13..9d56bb661 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -91,12 +91,12 @@ jobs: - os: ubuntu-24.04 artifact-name: Linux cmake-preset: linux - qt-version: 6.10.1 + qt-version: 6.10.2 - os: ubuntu-24.04-arm artifact-name: Linux-aarch64 cmake-preset: linux - qt-version: 6.10.1 + qt-version: 6.10.2 - os: windows-2022 artifact-name: Windows-MinGW-w64 @@ -115,13 +115,13 @@ 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 + qt-version: 6.10.2 - os: windows-11-arm artifact-name: Windows-MSVC-arm64 cmake-preset: windows_msvc vcvars-arch: arm64 - qt-version: 6.10.1 + qt-version: 6.10.2 - os: macos-26 artifact-name: macOS diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 8a5fa26fb..e4830ddd9 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -79,12 +79,16 @@ jobs: uses: ./.github/actions/setup-dependencies with: build-type: Debug - qt-version: 6.10.1 + qt-version: 6.4.3 - name: Configure and Build run: | cmake --preset linux cmake --build --preset linux --config Debug + - name: Run tests + run: | + ctest --preset linux --build-config Debug + - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v4 diff --git a/CMakeLists.txt b/CMakeLists.txt index b73f58a4f..1abbbb049 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -283,7 +283,7 @@ set(Launcher_BUILD_TIMESTAMP "${TODAY}") # Find the required Qt parts if(Launcher_QT_VERSION_MAJOR EQUAL 6) set(QT_VERSION_MAJOR 6) - find_package(Qt6 REQUIRED COMPONENTS Core CoreTools Widgets Concurrent Network Test Xml NetworkAuth OpenGL) + find_package(Qt6 6.4 REQUIRED COMPONENTS Core CoreTools Widgets Concurrent Network Test Xml NetworkAuth OpenGL) find_package(Qt6 COMPONENTS DBus) list(APPEND Launcher_QT_DBUS Qt6::DBus) else()