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

Windeployqt: add output for determining plugin/module relation

Browse Source 
Windeployqt has a pull all in approach to plugins. This can require some
modules to be deployed despite being unrelated to the application's
dependencies. An output is added to provide information to better reflect
what windeployqt is doing in this regard.

Task-number: QTBUG-117910
Pick-to: 6.5
Change-Id: Iabf89e0faca862a90c0fcd46e5675dd43655be1d
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
(cherry picked from commit 40cff9e93c36edcab49c08fa65760c22dc935992)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 2dc02a2aeb546a57965e420a2a7ea6e6354fc651)
This commit is contained in:
Timothée Keller 2023-10-10 16:07:50 +02:00 committed by Qt Cherry-pick Bot
parent 8a0c94a117
commit f33405782b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -993,7 +993,7 @@ static QString deployPlugin(const QString &plugin, const QDir &subDir, const boo
*usedQtModules |= missingModules;
if (optVerboseLevel) {
std::wcout << "Adding " << formatQtModules(missingModules).constData()
<< " for " << plugin << '\n';
<< " for " << plugin << " from plugin type: " << subDirName << '\n';
}
}
return pluginPath;
@ -1036,7 +1036,7 @@ 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';
// Filter for platform or any.
QString filter;
const bool isPlatformPlugin = subDirName == "platforms"_L1;