Skip to content

Commit a5e98dc

Browse files
committed
Merge bitcoin/bitcoin#32651: cmake: Replace deprecated qt6_add_translation with qt6_add_lrelease
18cf727 cmake: Replace deprecated `qt6_add_translation` with `qt6_add_lrelease` (Hennadii Stepanov) Pull request description: See Qt docs: - https://doc.qt.io/archives/qt-6.2/qtlinguist-cmake-qt-add-translation.html - https://doc.qt.io/archives/qt-6.2/qtlinguist-cmake-qt-add-lrelease.html ACKs for top commit: fanquake: ACK 18cf727 Tree-SHA512: 10a4023b24d2936a41b8049063b0e210b76cd4d9c9e22a28de579a211f047b5446785005d6918f0b80c6461960717be62cf9b92b0c66000a95379a41dfa83fd2
2 parents 4af72d8 + 18cf727 commit a5e98dc

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/qt/CMakeLists.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,6 @@ set(CMAKE_AUTORCC ON)
5454
set(CMAKE_AUTOUIC ON)
5555
set(CMAKE_AUTOUIC_SEARCH_PATHS forms)
5656

57-
# TODO: The file(GLOB ...) command should be replaced with an explicit
58-
# file list. Such a change must be synced with the corresponding change
59-
# to https://github.com/bitcoin-core/bitcoin-maintainer-tools/blob/main/update-translations.py
60-
file(GLOB ts_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} locale/*.ts)
61-
set_source_files_properties(${ts_files} PROPERTIES OUTPUT_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/locale)
62-
qt6_add_translation(qm_files ${ts_files})
63-
6457
configure_file(bitcoin_locale.qrc bitcoin_locale.qrc USE_SOURCE_PERMISSIONS COPYONLY)
6558

6659
# The bitcoinqt sources have to include headers in
@@ -250,6 +243,13 @@ if(qt_lib_type STREQUAL "STATIC_LIBRARY")
250243
)
251244
endif()
252245

246+
file(GLOB ts_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} locale/*.ts)
247+
set_source_files_properties(${ts_files} PROPERTIES OUTPUT_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/locale)
248+
qt6_add_lrelease(bitcoinqt
249+
TS_FILES ${ts_files}
250+
OPTIONS -silent
251+
)
252+
253253
add_executable(bitcoin-qt
254254
main.cpp
255255
../init/bitcoin-qt.cpp

0 commit comments

Comments
 (0)