From 0b5f41eb422d1892afb456750e81742a2d1e4234 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Tue, 27 Jun 2017 13:04:46 +0200
Subject: [PATCH] windeployqt: Print missing modules in warning about disabled
plugins
Change-Id: Ice8b793c25ee1b57256a175d19a4314530b1f136
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
src/windeployqt/main.cpp | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp
index 6d1bad9de..ed7c39c73 100644
--- a/src/windeployqt/main.cpp
+++ b/src/windeployqt/main.cpp
@@ -914,9 +914,12 @@ QStringList findQtPlugins(quint64 *usedQtModules, quint64 disabledQtModules,
std::wcerr << "Warning: Cannot determine dependencies of "
<< QDir::toNativeSeparators(pluginPath) << ": " << errorMessage << '\n';
}
- if (neededModules & disabledQtModules) {
- if (optVerboseLevel)
- std::wcout << "Skipping plugin " << plugin << " due to disabled dependencies.\n";
+ if (const quint64 missingModules = neededModules & disabledQtModules) {
+ if (optVerboseLevel) {
+ std::wcout << "Skipping plugin " << plugin
+ << " due to disabled dependencies ("
+ << formatQtModules(missingModules).constData() << ").\n";
+ }
} else {
if (const quint64 missingModules = (neededModules & ~*usedQtModules)) {
*usedQtModules |= missingModules;
--
GitLab