Windeployqt: remove unused library list

When windeployqt had hard coded module information, it had
result.directlyUsedQtLibraries, and result.usedQtLibraries. The latter
was meant to add in the modules that weren't defined. Since we now read
available modules directly, there is no need for result.usedQtLibraries
since it should always be identical to result.directlyUsedQtLibraries.

Pick-to: 6.7
Change-Id: I60e38c176b11626c1ef5a844e80bc701a9eed189
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>

1 files changed, 1 insertions, 12 deletions

diff --git a/src/tools/windeployqt/main.cpp b/src/tools/windeployqt/main.cpp
index cb3a1bc2a1..b90fb94cf3 100644
--- a/src/tools/windeployqt/main.cpp
+++ b/src/tools/windeployqt/main.cpp
@@ -1184,7 +1184,6 @@ struct DeployResult
     bool success = false;
     bool isDebug = false;
     ModuleBitset directlyUsedQtLibraries;
-    ModuleBitset usedQtLibraries;
     ModuleBitset deployedQtLibraries;
 };
 
@@ -1532,17 +1531,8 @@ static DeployResult deploy(const Options &options, const QMap<QString, QString>
     }
 
     QString platformPlugin;
-    // Sort apart Qt 5 libraries in the ones that are represented by the
-    // QtModule enumeration (and thus controlled by flags) and others.
     QStringList deployedQtLibraries;
-    for (int i = 0 ; i < dependentQtLibs.size(); ++i)  {
-        const qint64 module = qtModule(dependentQtLibs.at(i), infix);
-        if (module >= 0)
-            result.usedQtLibraries[module] = 1;
-        else
-            deployedQtLibraries.push_back(dependentQtLibs.at(i)); // Not represented by flag.
-    }
-    result.deployedQtLibraries = (result.usedQtLibraries | options.additionalLibraries) & ~options.disabledLibraries;
+    result.deployedQtLibraries = (result.directlyUsedQtLibraries | options.additionalLibraries) & ~options.disabledLibraries;
 
     ModuleBitset disabled = options.disabledLibraries;
     if (!usesQml2) {
@@ -1572,7 +1562,6 @@ static DeployResult deploy(const Options &options, const QMap<QString, QString>
 
     if (optVerboseLevel >= 1) {
         std::wcout << "Direct dependencies: " << formatQtModules(result.directlyUsedQtLibraries).constData()
-                   << "\nAll dependencies   : " << formatQtModules(result.usedQtLibraries).constData()
                    << "\nTo be deployed     : " << formatQtModules(result.deployedQtLibraries).constData() << '\n';
     }