From 6f1553774aa8d8e2112f73b9ee1c88fb41ddbca7 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 19 Feb 2025 10:51:14 +0100 Subject: [PATCH] CMake: Remove deprecated deployment API argument [ChangeLog][CMake] The FILENAME_VARIABLE option of qt6_generate_deploy_[app_]script, which was deprecated in 6.6.0, has been removed. Change-Id: I15bd4c121772d28014776398fa00769e8efeada0 Reviewed-by: Alexey Edelev --- src/corelib/Qt6CoreMacros.cmake | 38 --------------------------------- 1 file changed, 38 deletions(-) diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index a036bef1d92..4eb90fb10fc 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -3604,10 +3604,6 @@ function(qt6_generate_deploy_script) OUTPUT_SCRIPT NAME TARGET - - # TODO: For backward compatibility / transitional use only, - # remove at some point - FILENAME_VARIABLE ) set(multi_value_options "") cmake_parse_arguments(PARSE_ARGV 0 arg @@ -3617,21 +3613,6 @@ function(qt6_generate_deploy_script) message(FATAL_ERROR "Unexpected arguments: ${arg_UNPARSED_ARGUMENTS}") endif() - # TODO: Remove when FILENAME_VARIABLE is fully removed - # Handle the slow deprecation of FILENAME_VARIABLE - if(arg_FILENAME_VARIABLE) - if(arg_OUTPUT_SCRIPT AND NOT arg_FILENAME_VARIABLE STREQUAL arg_OUTPUT_SCRIPT) - message(FATAL_ERROR - "Both FILENAME_VARIABLE and OUTPUT_SCRIPT were given and were different. " - "Only one of the two should be used." - ) - endif() - message(AUTHOR_WARNING - "The FILENAME_VARIABLE keyword is deprecated and will be removed soon. Please use OUTPUT_SCRIPT instead.") - set(arg_OUTPUT_SCRIPT "${arg_FILENAME_VARIABLE}") - unset(arg_FILENAME_VARIABLE) - endif() - if(NOT arg_OUTPUT_SCRIPT) message(FATAL_ERROR "OUTPUT_SCRIPT must be specified") endif() @@ -3720,10 +3701,6 @@ function(qt6_generate_deploy_app_script) set(single_value_options TARGET OUTPUT_SCRIPT - - # TODO: For backward compatibility / transitional use only, - # remove at some point - FILENAME_VARIABLE ) set(qt_deploy_runtime_dependencies_options # These options are forwarded as is to qt_deploy_runtime_dependencies. @@ -3748,21 +3725,6 @@ function(qt6_generate_deploy_app_script) message(FATAL_ERROR "TARGET must be specified") endif() - # TODO: Remove when FILENAME_VARIABLE is fully removed - # Handle the slow deprecation of FILENAME_VARIABLE - if(arg_FILENAME_VARIABLE) - if(arg_OUTPUT_SCRIPT AND NOT arg_FILENAME_VARIABLE STREQUAL arg_OUTPUT_SCRIPT) - message(FATAL_ERROR - "Both FILENAME_VARIABLE and OUTPUT_SCRIPT were given and were different. " - "Only one of the two should be used." - ) - endif() - message(AUTHOR_WARNING - "The FILENAME_VARIABLE keyword is deprecated and will be removed soon. Please use OUTPUT_SCRIPT instead.") - set(arg_OUTPUT_SCRIPT "${arg_FILENAME_VARIABLE}") - unset(arg_FILENAME_VARIABLE) - endif() - if(NOT arg_OUTPUT_SCRIPT) message(FATAL_ERROR "OUTPUT_SCRIPT must be specified") endif()