1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Set CFBundleDevelopmentRegion from QT_I18N_SOURCE_LANGUAGE

Browse Source 
The value of QT_I18N_TRANSLATED_LANGUAGES is reflected in generated
Info.plist files. We should do the same for QT_I18N_SOURCE_LANGUAGE.

Pick-to: 6.7
Fixes: QTBUG-126790
Change-Id: Id9d680a183047942585e00f5d8cf1ac3c2352c9f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit ea435bb12766fea1a20cfdf67b8433593d20aeae)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Joerg Bornemann 2024-07-01 11:45:44 +02:00 committed by Qt Cherry-pick Bot
parent 38ce3c67be
commit 2e58e04c75
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cmake/QtPublicAppleHelpers.cmake
View File

@ -628,10 +628,7 @@ function(_qt_internal_set_apple_localizations target)
COMMANDS "print CFBundleLocalizations" COMMANDS "print CFBundleLocalizations"
OUTPUT_VARIABLE existing_localizations OUTPUT_VARIABLE existing_localizations
) )
if(existing_localizations) if(NOT existing_localizations)
return()
endif()
list(TRANSFORM supported_languages PREPEND list(TRANSFORM supported_languages PREPEND
"Add CFBundleLocalizations: string ") "Add CFBundleLocalizations: string ")
@ -641,6 +638,21 @@ function(_qt_internal_set_apple_localizations target)
${supported_languages} ${supported_languages}
"Delete CFBundleAllowMixedLocalizations" "Delete CFBundleAllowMixedLocalizations"
) )
endif()
if(NOT "${QT_I18N_SOURCE_LANGUAGE}" STREQUAL "")
_qt_internal_plist_buddy("${plist_file}"
COMMANDS "print CFBundleDevelopmentRegion"
OUTPUT_VARIABLE existing_dev_region
)
if(NOT existing_dev_region)
_qt_internal_plist_buddy("${plist_file}"
COMMANDS
"Add CFBundleDevelopmentRegion string"
"Set CFBundleDevelopmentRegion ${QT_I18N_SOURCE_LANGUAGE}"
)
endif()
endif()
endfunction() endfunction()
function(_qt_internal_set_ios_simulator_arch target) function(_qt_internal_set_ios_simulator_arch target)