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

CMake: Remove deprecated deployment API argument

Browse Source 
[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 <alexey.edelev@qt.io>
This commit is contained in:
Joerg Bornemann 2025-02-19 10:51:14 +01:00
parent fb2ef7e231
commit 6f1553774a
1 changed files with 0 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/corelib/Qt6CoreMacros.cmake
View File

@ -3604,10 +3604,6 @@ function(qt6_generate_deploy_script)
OUTPUT_SCRIPT OUTPUT_SCRIPT
NAME NAME
TARGET TARGET
# TODO: For backward compatibility / transitional use only,
# remove at some point
FILENAME_VARIABLE
) )
set(multi_value_options "") set(multi_value_options "")
cmake_parse_arguments(PARSE_ARGV 0 arg cmake_parse_arguments(PARSE_ARGV 0 arg
@ -3617,21 +3613,6 @@ function(qt6_generate_deploy_script)
message(FATAL_ERROR "Unexpected arguments: ${arg_UNPARSED_ARGUMENTS}") message(FATAL_ERROR "Unexpected arguments: ${arg_UNPARSED_ARGUMENTS}")
endif() 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) if(NOT arg_OUTPUT_SCRIPT)
message(FATAL_ERROR "OUTPUT_SCRIPT must be specified") message(FATAL_ERROR "OUTPUT_SCRIPT must be specified")
endif() endif()
@ -3720,10 +3701,6 @@ function(qt6_generate_deploy_app_script)
set(single_value_options set(single_value_options
TARGET TARGET
OUTPUT_SCRIPT OUTPUT_SCRIPT
# TODO: For backward compatibility / transitional use only,
# remove at some point
FILENAME_VARIABLE
) )
set(qt_deploy_runtime_dependencies_options set(qt_deploy_runtime_dependencies_options
# These options are forwarded as is to qt_deploy_runtime_dependencies. # 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") message(FATAL_ERROR "TARGET must be specified")
endif() 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) if(NOT arg_OUTPUT_SCRIPT)
message(FATAL_ERROR "OUTPUT_SCRIPT must be specified") message(FATAL_ERROR "OUTPUT_SCRIPT must be specified")
endif() endif()