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

Revert "Windeployqt: remove unused library list"

Browse Source 
This reverts commit a05abede682db4ab20a7c1d9eb45a487e91d6a78.

Reason for revert: Causes QTBUG-123325

Change-Id: I251b67798af3d768db6f2836b52ded558c0c8211
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
This commit is contained in:
Timothée Keller 2024-03-14 15:09:53 +00:00 committed by Oliver Wolff
parent 9d791aabad
commit cfcfe7d07b
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1184,6 +1184,7 @@ struct DeployResult
bool success = false; bool success = false;
bool isDebug = false; bool isDebug = false;
ModuleBitset directlyUsedQtLibraries; ModuleBitset directlyUsedQtLibraries;
ModuleBitset usedQtLibraries;
ModuleBitset deployedQtLibraries; ModuleBitset deployedQtLibraries;
}; };
@ -1531,8 +1532,17 @@ 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;
result.deployedQtLibraries = (result.directlyUsedQtLibraries | options.additionalLibraries) & ~options.disabledLibraries; 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;
ModuleBitset disabled = options.disabledLibraries; ModuleBitset disabled = options.disabledLibraries;
if (!usesQml2) { if (!usesQml2) {
@ -1562,6 +1572,7 @@ 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';
} }