dawy_go/vnote
1
0
Fork 0
mirror of https://gitee.com/vnotex/vnote.git synced 2025-07-05 05:49:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix build break on Qt 6.7 (#2511)

Browse Source
This commit is contained in:
Le Tan 2024-06-11 06:22:08 -07:00 committed by GitHub
parent 61528de505
commit bfb0e5bd29
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/ci-macos.yml vendored
View File

@ -31,6 +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
runs-on: ${{matrix.config.os}} runs-on: ${{matrix.config.os}}
@ -81,7 +82,7 @@ jobs:
- 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: ${{matrix.config.qt}}
target: desktop target: desktop
modules: 'qtwebengine qtwebchannel qtpositioning qtpdf qtimageformats qt5compat qtserialport' modules: 'qtwebengine qtwebchannel qtpositioning qtpdf qtimageformats qt5compat qtserialport'
cache: 'true' cache: 'true'

9
src/CMakeLists.txt
View File

@ -31,8 +31,13 @@ set_source_files_properties(${VX_APP_ICON_MACOS} PROPERTIES
# Translations # Translations
set(VX_TS_FILES data/core/translations/vnote_zh_CN.ts set(VX_TS_FILES data/core/translations/vnote_zh_CN.ts
data/core/translations/vnote_ja.ts) data/core/translations/vnote_ja.ts)
if((QT_DEFAULT_MAJOR_VERSION GREATER 5)) if((QT_DEFAULT_MAJOR_VERSION EQUAL 6))
qt_add_lupdate(vnote TS_FILES ${VX_TS_FILES}) if((Qt6Widgets_VERSION VERSION_GREATER_EQUAL 6.7.0))
qt_add_lupdate(TS_FILES ${VX_TS_FILES}
SOURCE_TARGETS vnote)
else()
qt_add_lupdate(vnote TS_FILES ${VX_TS_FILES})
endif()
endif() endif()
# Generate .qm files from .ts files (lrelease) # Generate .qm files from .ts files (lrelease)
set_source_files_properties(${VX_TS_FILES} PROPERTIES set_source_files_properties(${VX_TS_FILES} PROPERTIES