mc-in-work/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-06-29 01:54:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

chore: update to Qt 6.10.2 on windows and linux appimage/portable

Browse source 
also switches codeql to build on Qt 6.4.3, to make sure prism still builds on the oldest version we still wanna support.
for this reason, codeql also now runs tests (to see if they don't fail on 6.4.3). While doing this I also noticed our qt requirement is 6.4, as we use Qt::Literals::StringLiterals

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
This commit is contained in:
DioEgizio 2026-01-30 17:23:34 +01:00
parent 204f9c5d8e
commit b1857508f7
3 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/build.yml vendored
View file

@ -91,12 +91,12 @@ jobs:
- os: ubuntu-24.04 - os: ubuntu-24.04
artifact-name: Linux artifact-name: Linux
cmake-preset: linux cmake-preset: linux
qt-version: 6.10.1 qt-version: 6.10.2
- os: ubuntu-24.04-arm - os: ubuntu-24.04-arm
artifact-name: Linux-aarch64 artifact-name: Linux-aarch64
cmake-preset: linux cmake-preset: linux
qt-version: 6.10.1 qt-version: 6.10.2
- os: windows-2022 - os: windows-2022
artifact-name: Windows-MinGW-w64 artifact-name: Windows-MinGW-w64
@ -115,13 +115,13 @@ jobs:
cmake-preset: windows_msvc cmake-preset: windows_msvc
# TODO(@getchoo): This is the default in setup-dependencies/windows. Why isn't it working?!?! # TODO(@getchoo): This is the default in setup-dependencies/windows. Why isn't it working?!?!
vcvars-arch: amd64 vcvars-arch: amd64
qt-version: 6.10.1 qt-version: 6.10.2
- os: windows-11-arm - os: windows-11-arm
artifact-name: Windows-MSVC-arm64 artifact-name: Windows-MSVC-arm64
cmake-preset: windows_msvc cmake-preset: windows_msvc
vcvars-arch: arm64 vcvars-arch: arm64
qt-version: 6.10.1 qt-version: 6.10.2
- os: macos-26 - os: macos-26
artifact-name: macOS artifact-name: macOS

6
.github/workflows/codeql.yml vendored
View file

@ -79,12 +79,16 @@ jobs:
uses: ./.github/actions/setup-dependencies uses: ./.github/actions/setup-dependencies
with: with:
build-type: Debug build-type: Debug
qt-version: 6.10.1 qt-version: 6.4.3
- name: Configure and Build - name: Configure and Build
run: | run: |
cmake --preset linux cmake --preset linux
cmake --build --preset linux --config Debug cmake --build --preset linux --config Debug
- name: Run tests
run: |
ctest --preset linux --build-config Debug
- name: Perform CodeQL Analysis - name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v4 uses: github/codeql-action/analyze@v4

2
CMakeLists.txt
View file

@ -283,7 +283,7 @@ set(Launcher_BUILD_TIMESTAMP "${TODAY}")
# Find the required Qt parts # Find the required Qt parts
if(Launcher_QT_VERSION_MAJOR EQUAL 6) if(Launcher_QT_VERSION_MAJOR EQUAL 6)
set(QT_VERSION_MAJOR 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) find_package(Qt6 COMPONENTS DBus)
list(APPEND Launcher_QT_DBUS Qt6::DBus) list(APPEND Launcher_QT_DBUS Qt6::DBus)
else() else()