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

Windeployqt: remove unused library list

Browse Source 
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 <oliver.wolff@qt.io>
(cherry picked from commit a05abede682db4ab20a7c1d9eb45a487e91d6a78)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Timothée Keller 2023-12-05 10:42:58 +01:00 committed by Qt Cherry-pick Bot
parent f7f5477ec5
commit d7069db3b0
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1148,7 +1148,6 @@ struct DeployResult
bool success = false; bool success = false;
bool isDebug = false; bool isDebug = false;
ModuleBitset directlyUsedQtLibraries; ModuleBitset directlyUsedQtLibraries;
ModuleBitset usedQtLibraries;
ModuleBitset deployedQtLibraries; ModuleBitset deployedQtLibraries;
}; };
@ -1496,17 +1495,8 @@ static DeployResult deploy(const Options &options, const QMap<QString, QString>
} }
QString platformPlugin; 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; QStringList deployedQtLibraries;
for (int i = 0 ; i < dependentQtLibs.size(); ++i) { result.deployedQtLibraries = (result.directlyUsedQtLibraries | options.additionalLibraries) & ~options.disabledLibraries;
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;
ModuleBitset disabled = options.disabledLibraries; ModuleBitset disabled = options.disabledLibraries;
if (!usesQml2) { if (!usesQml2) {
@ -1536,7 +1526,6 @@ static DeployResult deploy(const Options &options, const QMap<QString, QString>
if (optVerboseLevel >= 1) { if (optVerboseLevel >= 1) {
std::wcout << "Direct dependencies: " << formatQtModules(result.directlyUsedQtLibraries).constData() std::wcout << "Direct dependencies: " << formatQtModules(result.directlyUsedQtLibraries).constData()
<< "\nAll dependencies : " << formatQtModules(result.usedQtLibraries).constData()
<< "\nTo be deployed : " << formatQtModules(result.deployedQtLibraries).constData() << '\n'; << "\nTo be deployed : " << formatQtModules(result.deployedQtLibraries).constData() << '\n';
} }