summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2022-03-21 15:13:52 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-03-21 16:50:08 +0000
commitb12d851d7e37fe632b2fc21db665a0a0719e8e16 (patch)
tree97791f58e2b7b7ffa097ad983e0ccea6c6bc3b52
parentf14544ab925531deae40e18a3eb01e5724f3ed9f (diff)
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.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/linguist/Qt6LinguistToolsMacros.cmake b/src/linguist/Qt6LinguistToolsMacros.cmake
index 61aad83de..4585db4d7 100644
--- a/src/linguist/Qt6LinguistToolsMacros.cmake
+++ b/src/linguist/Qt6LinguistToolsMacros.cmake
@@ -328,7 +328,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