From 7cc8303968eddd8979ae1daa139eac7236e7458e Mon Sep 17 00:00:00 2001 From: Le Tan Date: Tue, 11 Jun 2024 21:18:25 +0800 Subject: [PATCH] fix build break on Qt 6.7 --- .github/workflows/ci-macos.yml | 3 ++- src/CMakeLists.txt | 9 +++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml index c8551badd9..eb7dab055c 100644 --- a/.github/workflows/ci-macos.yml +++ b/.github/workflows/ci-macos.yml @@ -31,6 +31,7 @@ jobs: - name: "Build on Arm64" os: macos-latest arch: universal + qt: 6.5.3 runs-on: ${{matrix.config.os}} @@ -81,7 +82,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v3 with: - version: 6.5.3 + version: ${{matrix.config.qt}} target: desktop modules: 'qtwebengine qtwebchannel qtpositioning qtpdf qtimageformats qt5compat qtserialport' cache: 'true' diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b51ea17a46..feaae5e37e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -31,8 +31,13 @@ set_source_files_properties(${VX_APP_ICON_MACOS} PROPERTIES # Translations set(VX_TS_FILES data/core/translations/vnote_zh_CN.ts data/core/translations/vnote_ja.ts) -if((QT_DEFAULT_MAJOR_VERSION GREATER 5)) - qt_add_lupdate(vnote TS_FILES ${VX_TS_FILES}) +if((QT_DEFAULT_MAJOR_VERSION EQUAL 6)) + 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() # Generate .qm files from .ts files (lrelease) set_source_files_properties(${VX_TS_FILES} PROPERTIES