From 2dc02a2aeb546a57965e420a2a7ea6e6354fc651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Keller?= Date: Tue, 10 Oct 2023 16:07:50 +0200 Subject: [PATCH] Windeployqt: add output for determining plugin/module relation 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.6 6.5 Change-Id: Iabf89e0faca862a90c0fcd46e5675dd43655be1d Reviewed-by: Oliver Wolff (cherry picked from commit 40cff9e93c36edcab49c08fa65760c22dc935992) Reviewed-by: Qt Cherry-pick Bot --- src/tools/windeployqt/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/windeployqt/main.cpp b/src/tools/windeployqt/main.cpp index 0f991bf02a0..cc649f987d1 100644 --- a/src/tools/windeployqt/main.cpp +++ b/src/tools/windeployqt/main.cpp @@ -999,7 +999,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; @@ -1042,7 +1042,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;