upgrade to Qt 6.8.3 (#2598)

* upgrade to Qt 6.8.3

* fix cache action

* use 2022 for 6.8

* fix vs

* fix linjux

* fix
This commit is contained in:
Le Tan 2025-04-02 13:27:30 +08:00 committed by GitHub
parent ac20b7f80c
commit a5a9b32ea3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 18 additions and 12 deletions

View File

@ -62,15 +62,15 @@ jobs:
- name: Cache Qt - name: Cache Qt
id: cache-qt id: cache-qt
uses: actions/cache@v1 # not v2! uses: actions/cache@v4
with: with:
path: ../Qt path: ../Qt
key: ${{ runner.os }}-QtCache-6.5 key: ${{ runner.os }}-QtCache-6.8
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v3 uses: jurplel/install-qt-action@v3
with: with:
version: 6.5.3 version: 6.8.3
target: desktop target: desktop
modules: 'qtwebengine qtwebchannel qtpositioning qtpdf qtimageformats qt5compat qtserialport' modules: 'qtwebengine qtwebchannel qtpositioning qtpdf qtimageformats qt5compat qtserialport'
tools: 'tools_opensslv3_src' tools: 'tools_opensslv3_src'
@ -114,6 +114,8 @@ jobs:
- name: Build Project - name: Build Project
run: | run: |
# Remove the libqsqlmimer.so as libmimerapi.so is not deployed with Qt6
rm ${{runner.workspace}}/Qt/6.*/gcc_64/plugins/sqldrivers/libqsqlmimer.so
cmake --build . --target pack cmake --build . --target pack
working-directory: ${{runner.workspace}}/build working-directory: ${{runner.workspace}}/build

View File

@ -31,7 +31,7 @@ jobs:
- name: "Build on Arm64" - name: "Build on Arm64"
os: macos-latest os: macos-latest
arch: universal arch: universal
qt: 6.5.3 qt: 6.8.3
runs-on: ${{matrix.config.os}} runs-on: ${{matrix.config.os}}
@ -81,10 +81,10 @@ jobs:
- name: Cache Qt - name: Cache Qt
id: cache-qt id: cache-qt
uses: actions/cache@v1 # not v2! uses: actions/cache@v4
with: with:
path: ../Qt path: ../Qt
key: ${{ runner.os }}-QtCache-6.5 key: ${{ runner.os }}-QtCache-6.8
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v3 uses: jurplel/install-qt-action@v3

View File

@ -21,7 +21,7 @@ env:
jobs: jobs:
build: build:
name: ${{ matrix.config.name }} name: ${{ matrix.config.name }}
runs-on: windows-2019 runs-on: windows-${{ matrix.config.vs_version }}
timeout-minutes: 120 timeout-minutes: 120
strategy: strategy:
@ -30,14 +30,18 @@ jobs:
config: config:
- name: "Build on Win64 Qt 5.15" - name: "Build on Win64 Qt 5.15"
arch: win64_msvc2019_64 arch: win64_msvc2019_64
vs_version: 2019
vs_cmd: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\VC\\Auxiliary\\Build\\vcvars64.bat"
qt: 5.15.2 qt: 5.15.2
qt_modules: qtwebengine qt_modules: qtwebengine
qt_tools: tools_opensslv3_x64 qt_tools: tools_opensslv3_x64
qt_major: 5 qt_major: 5
suffix: "-windows7" suffix: "-windows7"
- name: "Build on Win64 Qt 6.5" - name: "Build on Win64 Qt 6"
arch: win64_msvc2019_64 arch: win64_msvc2022_64
qt: 6.5.3 vs_version: 2022
vs_cmd: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build\\vcvars64.bat"
qt: 6.8.3
qt_modules: "qtwebengine qtwebchannel qtpositioning qtpdf qtimageformats qt5compat" qt_modules: "qtwebengine qtwebchannel qtpositioning qtpdf qtimageformats qt5compat"
qt_tools: tools_opensslv3_x64 qt_tools: tools_opensslv3_x64
qt_major: 6 qt_major: 6
@ -58,7 +62,7 @@ jobs:
- name: Cache Qt - name: Cache Qt
id: cache-qt id: cache-qt
uses: actions/cache@v1 # not v2! uses: actions/cache@v4
with: with:
path: ../Qt path: ../Qt
key: ${{runner.os}}-${{matrix.config.arch}}-QtCache-${{matrix.config.qt}} key: ${{runner.os}}-${{matrix.config.arch}}-QtCache-${{matrix.config.qt}}
@ -94,7 +98,7 @@ jobs:
shell: cmd shell: cmd
run: | run: |
cmake --version cmake --version
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 call "${{matrix.config.vs_cmd}}"
cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DQT_DEFAULT_MAJOR_VERSION=${{matrix.config.qt_major}} -DOPENSSL_EXTRA_LIB_DIR=${{runner.workspace}}\build\openssl-utils.git\1.1.1j\Win_x64 %GITHUB_WORKSPACE% cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DQT_DEFAULT_MAJOR_VERSION=${{matrix.config.qt_major}} -DOPENSSL_EXTRA_LIB_DIR=${{runner.workspace}}\build\openssl-utils.git\1.1.1j\Win_x64 %GITHUB_WORKSPACE%
cmake --build . cmake --build .
cmake --build . --target=pack cmake --build . --target=pack