diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index ec853662b6a..3e13f0a778f 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -3692,6 +3692,7 @@ function(qt6_generate_deploy_app_script) # package). We would add an EXECUTABLE keyword for that, which would be # mutually exclusive with the TARGET keyword. set(no_value_options + NO_PLUGINS NO_TRANSLATIONS NO_COMPILER_RUNTIME NO_UNSUPPORTED_PLATFORM_ERROR @@ -3703,6 +3704,10 @@ function(qt6_generate_deploy_app_script) set(qt_deploy_runtime_dependencies_options # These options are forwarded as is to qt_deploy_runtime_dependencies. DEPLOY_TOOL_OPTIONS + EXCLUDE_PLUGINS + EXCLUDE_PLUGIN_TYPES + INCLUDE_PLUGINS + INCLUDE_PLUGIN_TYPES PRE_INCLUDE_REGEXES PRE_EXCLUDE_REGEXES POST_INCLUDE_REGEXES @@ -3752,6 +3757,9 @@ function(qt6_generate_deploy_app_script) ) set(common_deploy_args "") + if(arg_NO_PLUGINS) + string(APPEND common_deploy_args " NO_PLUGINS\n") + endif() if(arg_NO_TRANSLATIONS) string(APPEND common_deploy_args " NO_TRANSLATIONS\n") endif() diff --git a/src/corelib/doc/src/cmake/qt_generate_deploy_app_script.qdoc b/src/corelib/doc/src/cmake/qt_generate_deploy_app_script.qdoc index 31d9e4384b2..4606871db6b 100644 --- a/src/corelib/doc/src/cmake/qt_generate_deploy_app_script.qdoc +++ b/src/corelib/doc/src/cmake/qt_generate_deploy_app_script.qdoc @@ -24,6 +24,11 @@ qt_generate_deploy_app_script( [NO_TRANSLATIONS] [NO_COMPILER_RUNTIME] [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 ...] [PRE_INCLUDE_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 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()}, {qt6_generate_deploy_script}{qt_generate_deploy_script()}, {qt6_generate_deploy_qml_app_script}{qt_generate_deploy_qml_app_script()}