whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: Bring back renamed parameters for qt_standard_project_setup 

Resurrect the parameters I18N_LANGUAGES and I18N_NATIVE_LANGUAGE for now
to allow integration of renaming changes that are a result of the Qt 6.7
CMake API review. Also, unblock dependency updates in qttools.

These parameters will be removed once all dependencies have been updated
throughout the repos.

Fixes: QTBUG-122691
Change-Id: Id0bfba50c7b168c61457ddf02b89e3d2c785e02b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
bb10
Joerg Bornemann 2024-02-23 14:14:43 +01:00
parent 382ee7e200
commit 18afb3bcd0
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/corelib/Qt6CoreMacros.cmake
View File

@ -3198,9 +3198,11 @@ macro(qt6_standard_project_setup)
REQUIRES
SUPPORTS_UP_TO
I18N_SOURCE_LANGUAGE
I18N_NATIVE_LANGUAGE # intermediate, remove after dependencies trickled through
)
set(__qt_sps_args_multi
I18N_TRANSLATED_LANGUAGES
I18N_LANGUAGES # intermediate, remove after dependencies trickled through
)
cmake_parse_arguments(__qt_sps_arg
"${__qt_sps_args_option}"
@ -3209,6 +3211,14 @@ macro(qt6_standard_project_setup)
${ARGN}
)
# intermediate, remove after dependencies trickled through
if(DEFINED arg_I18N_NATIVE_LANGUAGE)
set(arg_I18N_SOURCE_LANGUAGE ${arg_I18N_NATIVE_LANGUAGE})
endif()
if(DEFINED arg_I18N_LANGUAGES)
set(arg_I18N_TRANSLATED_LANGUAGES ${arg_I18N_LANGUAGES})
endif()
if(__qt_sps_arg_UNPARSED_ARGUMENTS)
message(FATAL_ERROR "Unexpected arguments: ${arg_UNPARSED_ARGUMENTS}")
endif()