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

Windeployqt: prevent output for --list option

Browse Source 
Some outputs weren't guarded with the optVerboseLevel which caused them
to occur even with the --list option. Add a guard to prevent for that.

Fixes: QTBUG-122257
Pick-to: 6.6
Change-Id: Ide060cda4ac6f9b4470ca608120e2b8aa4819de5
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
(cherry picked from commit ad2da2080c8b99665cd32237ab365fee5461cf66)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Timothée Keller 2024-02-15 11:49:50 +01:00 committed by Qt Cherry-pick Bot
parent 933b606af5
commit 32ce7fa8d2
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/tools/windeployqt/main.cpp
View File

@ -946,11 +946,11 @@ static QString deployPlugin(const QString &plugin, const QDir &subDir, const boo
{
const QString subDirName = subDir.dirName();
// Filter out disabled plugins
if (pluginSelections.disabledPluginTypes.contains(subDirName)) {
if (optVerboseLevel && pluginSelections.disabledPluginTypes.contains(subDirName)) {
std::wcout << "Skipping plugin " << plugin << " due to skipped plugin type " << subDirName << '\n';
return {};
}
if (subDirName == u"generic" && plugin.contains(u"qinsighttracker")
if (optVerboseLevel && subDirName == u"generic" && plugin.contains(u"qinsighttracker")
&& !deployInsightTrackerPlugin) {
std::wcout << "Skipping plugin " << plugin
<< ". Use -deploy-insighttracker if you want to use it.\n";
@ -965,7 +965,7 @@ static QString deployPlugin(const QString &plugin, const QDir &subDir, const boo
: dotIndex;
const QString pluginName = plugin.first(stripIndex);
if (pluginSelections.excludedPlugins.contains(pluginName)) {
if (optVerboseLevel && pluginSelections.excludedPlugins.contains(pluginName)) {
std::wcout << "Skipping plugin " << plugin << " due to exclusion option" << '\n';
return {};
}
@ -1059,7 +1059,8 @@ QStringList findQtPlugins(ModuleBitset *usedQtModules, const ModuleBitset &disab
? MatchDebugOrRelease // QTBUG-44331: Debug detection does not work for webengine, deploy all.
: debugMatchModeIn;
QDir subDir(subDirFi.absoluteFilePath());
std::wcout << "Adding in plugin type " << subDirFi.baseName() << " for module: " << qtModuleEntries.moduleById(module).name << '\n';
if (optVerboseLevel)
std::wcout << "Adding in plugin type " << subDirFi.baseName() << " for module: " << qtModuleEntries.moduleById(module).name << '\n';
const bool isPlatformPlugin = subDirName == "platforms"_L1;
const QStringList plugins =