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

CMake: Remove intermediate qt_standard_project_setup parameters

Browse Source 
This reverts 18afb3bcd0471082101f8813a017b0444942cc4c.

Fixes: QTBUG-126462
Change-Id: Icf9555562503b1abd81a6c33ef52c1eae0fc1105
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 445a74de00aadeb3598d3f578a86491a9a2f4bae)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Joerg Bornemann 2024-06-20 11:33:17 +02:00 committed by Qt Cherry-pick Bot
parent 2a11f4c032
commit c6dd4856ca
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/corelib/Qt6CoreMacros.cmake
View File

@ -3355,11 +3355,9 @@ macro(qt6_standard_project_setup)
REQUIRES REQUIRES
SUPPORTS_UP_TO SUPPORTS_UP_TO
I18N_SOURCE_LANGUAGE I18N_SOURCE_LANGUAGE
I18N_NATIVE_LANGUAGE # intermediate, remove after dependencies trickled through
) )
set(__qt_sps_args_multi set(__qt_sps_args_multi
I18N_TRANSLATED_LANGUAGES I18N_TRANSLATED_LANGUAGES
I18N_LANGUAGES # intermediate, remove after dependencies trickled through
) )
cmake_parse_arguments(__qt_sps_arg cmake_parse_arguments(__qt_sps_arg
"${__qt_sps_args_option}" "${__qt_sps_args_option}"
@ -3368,14 +3366,6 @@ macro(qt6_standard_project_setup)
${ARGN} ${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) if(__qt_sps_arg_UNPARSED_ARGUMENTS)
message(FATAL_ERROR "Unexpected arguments: ${arg_UNPARSED_ARGUMENTS}") message(FATAL_ERROR "Unexpected arguments: ${arg_UNPARSED_ARGUMENTS}")
endif() endif()