From d7069db3b0f6c0d53ec6d0ac11e2ae6864cea877 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Keller?= Date: Tue, 5 Dec 2023 10:42:58 +0100 Subject: [PATCH] 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. Change-Id: I60e38c176b11626c1ef5a844e80bc701a9eed189 Reviewed-by: Oliver Wolff (cherry picked from commit a05abede682db4ab20a7c1d9eb45a487e91d6a78) Reviewed-by: Qt Cherry-pick Bot --- src/tools/windeployqt/main.cpp | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/tools/windeployqt/main.cpp b/src/tools/windeployqt/main.cpp index cc649f987d1..a92b4f9a8b8 100644 --- a/src/tools/windeployqt/main.cpp +++ b/src/tools/windeployqt/main.cpp @@ -1148,7 +1148,6 @@ struct DeployResult bool success = false; bool isDebug = false; ModuleBitset directlyUsedQtLibraries; - ModuleBitset usedQtLibraries; ModuleBitset deployedQtLibraries; }; @@ -1496,17 +1495,8 @@ static DeployResult deploy(const Options &options, const QMap } 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) { @@ -1536,7 +1526,6 @@ static DeployResult deploy(const Options &options, const QMap 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'; }