diff options
| author | Oliver Wolff <[email protected]> | 2025-03-26 09:15:08 +0100 |
|---|---|---|
| committer | Joerg Bornemann <[email protected]> | 2025-04-10 12:35:45 +0000 |
| commit | f017087214ecef973a59ed7b86540e3825a1b00a (patch) | |
| tree | c4533b103855eb49405bc121c432fab66715eef6 | |
| parent | 2ab472f6cbcb8505a84dac8acd8e6795b9af0b8d (diff) | |
windeployqt: Make "recursive plugin deployment" the default
5010eda5345bdbfc12e134d6fb3ae5b7370e2185 added a command line options
which made sure that plugins of dependent Qt modules were deployed. As
these plugins are mandatory for proper functionality of these modules,
this should be windeployqt's default. This change reflects this reality.
Deploy plugins of dependent Qt libraries by default.
The command line option was removed as opting out of this functionality
does not make sense
[ChangeLog][Tools][windeployqt] windeployqt now deploys plugins of all
dependent Qt modules by default. "--include-soft-plugins" became default
and the command line option was removed.
Change-Id: Ifc5e4d24803b0398c249461f14f2e58562477c80
Reviewed-by: Joerg Bornemann <[email protected]>
| -rw-r--r-- | src/tools/windeployqt/main.cpp | 8 | ||||
| -rw-r--r-- | src/tools/windeployqt/qtplugininfo.h | 1 |
2 files changed, 1 insertions, 8 deletions
diff --git a/src/tools/windeployqt/main.cpp b/src/tools/windeployqt/main.cpp index ddec54041dd..72eacf5088d 100644 --- a/src/tools/windeployqt/main.cpp +++ b/src/tools/windeployqt/main.cpp @@ -406,10 +406,6 @@ static inline int parseArguments(const QStringList &arguments, QCommandLineParse QStringLiteral("Skip plugin deployment.")); parser->addOption(noPluginsOption); - QCommandLineOption includeSoftPluginsOption(QStringLiteral("include-soft-plugins"), - QStringLiteral("Include in the deployment all relevant plugins by taking into account all soft dependencies.")); - parser->addOption(includeSoftPluginsOption); - QCommandLineOption skipPluginTypesOption(QStringLiteral("skip-plugin-types"), QStringLiteral("A comma-separated list of plugin types that are not deployed (qmltooling,generic)."), QStringLiteral("plugin types")); @@ -580,8 +576,6 @@ static inline int parseArguments(const QStringList &arguments, QCommandLineParse return CommandLineParseError; } - options->pluginSelections.includeSoftPlugins = parser->isSet(includeSoftPluginsOption); - if (parser->isSet(skipPluginTypesOption)) options->pluginSelections.disabledPluginTypes = parser->value(skipPluginTypesOption).split(u','); @@ -1127,7 +1121,7 @@ QStringList findQtPlugins(ModuleBitset *usedQtModules, const ModuleBitset &disab // If missing Qt modules were added during plugin deployment make additional pass, because we may need // additional plugins. - if (pluginSelections.includeSoftPlugins && missingQtModulesAdded) { + if (missingQtModulesAdded) { if (optVerboseLevel) { std::wcout << "Performing additional pass of finding Qt plugins due to updated Qt module list: " << formatQtModules(*usedQtModules).constData() << "\n"; diff --git a/src/tools/windeployqt/qtplugininfo.h b/src/tools/windeployqt/qtplugininfo.h index 420b2b5e1aa..1ca2401726c 100644 --- a/src/tools/windeployqt/qtplugininfo.h +++ b/src/tools/windeployqt/qtplugininfo.h @@ -24,7 +24,6 @@ struct PluginSelections QStringList enabledPluginTypes; QStringList excludedPlugins; QStringList includedPlugins; - bool includeSoftPlugins = false; }; class PluginInformation |