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

CMake: Add plugin-related arguments to qt_generate_deploy_app_script

Browse Source 
[ChangeLog][CMake] Added arguments for selecting Qt plugins to
qt_generate_deploy_app_script.

Change-Id: Ib69dd4674bb85ac59abde2873d0e974c04444bb5
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
This commit is contained in:
Joerg Bornemann 2025-03-26 17:10:19 +01:00
parent 6014820fe5
commit f2ac985d2f
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/Qt6CoreMacros.cmake
View File

@ -3692,6 +3692,7 @@ function(qt6_generate_deploy_app_script)
# package). We would add an EXECUTABLE keyword for that, which would be # package). We would add an EXECUTABLE keyword for that, which would be
# mutually exclusive with the TARGET keyword. # mutually exclusive with the TARGET keyword.
set(no_value_options set(no_value_options
NO_PLUGINS
NO_TRANSLATIONS NO_TRANSLATIONS
NO_COMPILER_RUNTIME NO_COMPILER_RUNTIME
NO_UNSUPPORTED_PLATFORM_ERROR NO_UNSUPPORTED_PLATFORM_ERROR
@ -3703,6 +3704,10 @@ function(qt6_generate_deploy_app_script)
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.
DEPLOY_TOOL_OPTIONS DEPLOY_TOOL_OPTIONS
EXCLUDE_PLUGINS
EXCLUDE_PLUGIN_TYPES
INCLUDE_PLUGINS
INCLUDE_PLUGIN_TYPES
PRE_INCLUDE_REGEXES PRE_INCLUDE_REGEXES
PRE_EXCLUDE_REGEXES PRE_EXCLUDE_REGEXES
POST_INCLUDE_REGEXES POST_INCLUDE_REGEXES
@ -3752,6 +3757,9 @@ function(qt6_generate_deploy_app_script)
) )
set(common_deploy_args "") set(common_deploy_args "")
if(arg_NO_PLUGINS)
string(APPEND common_deploy_args " NO_PLUGINS\n")
endif()
if(arg_NO_TRANSLATIONS) if(arg_NO_TRANSLATIONS)
string(APPEND common_deploy_args " NO_TRANSLATIONS\n") string(APPEND common_deploy_args " NO_TRANSLATIONS\n")
endif() endif()

10
src/corelib/doc/src/cmake/qt_generate_deploy_app_script.qdoc
View File

@ -24,6 +24,11 @@ qt_generate_deploy_app_script(
[NO_TRANSLATIONS] [NO_TRANSLATIONS]
[NO_COMPILER_RUNTIME] [NO_COMPILER_RUNTIME]
[NO_UNSUPPORTED_PLATFORM_ERROR] [NO_UNSUPPORTED_PLATFORM_ERROR]
[NO_PLUGINS] # since Qt 6.10
[EXCLUDE_PLUGIN_TYPES type_or_target...] # since Qt 6.10
[INCLUDE_PLUGIN_TYPES type_or_target...] # since Qt 6.10
[EXCLUDE_PLUGINS name...] # since Qt 6.10
[INCLUDE_PLUGINS name...] # since Qt 6.10
[DEPLOY_TOOL_OPTIONS ...] [DEPLOY_TOOL_OPTIONS ...]
[PRE_INCLUDE_REGEXES regexes...] [PRE_INCLUDE_REGEXES regexes...]
[PRE_EXCLUDE_REGEXES regexes...] [PRE_EXCLUDE_REGEXES regexes...]
@ -92,6 +97,11 @@ The options \c{PRE_INCLUDE_REGEXES}, \c{PRE_EXCLUDE_REGEXES},
dependencies. These options do not apply to all platforms and are forwarded dependencies. These options do not apply to all platforms and are forwarded
unmodified to \l{qt6_deploy_runtime_dependencies}{qt_deploy_runtime_dependencies()}. unmodified to \l{qt6_deploy_runtime_dependencies}{qt_deploy_runtime_dependencies()}.
The options \c EXCLUDE_PLUGINS, \c EXCLUDE_PLUGIN_TYPES, \c INCLUDE_PLUGINS, and
\c INCLUDE_PLUGIN_TYPES are used to select Qt plugins. See
\l{qt6_deploy_runtime_dependencies}{qt_deploy_runtime_dependencies()} for their
documentation.
\sa {qt6_standard_project_setup}{qt_standard_project_setup()}, \sa {qt6_standard_project_setup}{qt_standard_project_setup()},
{qt6_generate_deploy_script}{qt_generate_deploy_script()}, {qt6_generate_deploy_script}{qt_generate_deploy_script()},
{qt6_generate_deploy_qml_app_script}{qt_generate_deploy_qml_app_script()} {qt6_generate_deploy_qml_app_script}{qt_generate_deploy_qml_app_script()}