From 18afb3bcd0471082101f8813a017b0444942cc4c Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 23 Feb 2024 14:14:43 +0100 Subject: [PATCH] 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 --- src/corelib/Qt6CoreMacros.cmake | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index e3bc6eda1e..f8fda0ab83 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -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()