diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2022-03-21 15:13:52 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-03-21 16:50:08 +0000 |
| commit | 63ed682e4d0d53aded56b9fd77745752735793d7 (patch) | |
| tree | 6348dc7b56a94994636d5bc484134654860fad26 | |
| parent | ffc5058d50fcc94c26586dec2203018b7a5f3216 (diff) | |
| download | qttools-63ed682e4d0d53aded56b9fd77745752735793d7.tar.gz | |
qt6_add_translations: Fix duplicate target names for resources
Don't create the resource target "translations" but take the target name
into account that is passed to qt6_add_translations.
This fixes duplicated symbols if qt6_add_translations is called on
multiple static libraries that are then linked together into one binary.
Fixes: QTBUG-101319
Change-Id: Iac44960cea1a54b7946351b4c92788c0a7252471
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 170c1f146c33e0ac155c2c044cdd47d3c7a778b0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/linguist/Qt6LinguistToolsMacros.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/linguist/Qt6LinguistToolsMacros.cmake b/src/linguist/Qt6LinguistToolsMacros.cmake index d0a37f71a..7f5550851 100644 --- a/src/linguist/Qt6LinguistToolsMacros.cmake +++ b/src/linguist/Qt6LinguistToolsMacros.cmake @@ -322,7 +322,7 @@ function(qt6_add_translations target) QM_FILES_OUTPUT_VARIABLE qm_files OPTIONS "${arg_LRELEASE_OPTIONS}") if(NOT "${arg_RESOURCE_PREFIX}" STREQUAL "") - qt6_add_resources(${target} "translations" + qt6_add_resources(${target} "${target}_translations" PREFIX "${arg_RESOURCE_PREFIX}" BASE "${CMAKE_CURRENT_BINARY_DIR}" OUTPUT_TARGETS out_targets |