From 58861f78c0822f74744a3285abeb785219b8f96c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Keller?= Date: Mon, 21 Nov 2022 12:38:15 +0100 Subject: [PATCH] Windeployqt: adjust bitset change for scaling Replaced the ullong with Modulebitsets for when the number of modules exceeds 64 Pick-to: 6.4 Change-Id: I489d35bc53d6aacf7907f75957bd8c6d21fbeb60 Reviewed-by: Oliver Wolff --- src/tools/windeployqt/main.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/tools/windeployqt/main.cpp b/src/tools/windeployqt/main.cpp index 328c8fbd81..8cadc24cf9 100644 --- a/src/tools/windeployqt/main.cpp +++ b/src/tools/windeployqt/main.cpp @@ -698,7 +698,8 @@ static inline QString helpText(const QCommandLineParser &p) moduleHelp += "\n\nQt libraries can be added by passing their name (-xml) or removed by passing\n" "the name prepended by --no- (--no-xml). Available libraries:\n"_L1; - moduleHelp += lineBreak(QString::fromLatin1(formatQtModules(0xFFFFFFFFFFFFFFFFull, true))); + ModuleBitset mask; + moduleHelp += lineBreak(QString::fromLatin1(formatQtModules(mask.set(), true))); moduleHelp += u'\n'; result.replace(moduleStart, argumentsStart - moduleStart, moduleHelp); return result; @@ -1477,9 +1478,9 @@ static DeployResult deploy(const Options &options, const QMap } if (optVerboseLevel >= 1) { - std::wcout << "Direct dependencies: " << formatQtModules(result.directlyUsedQtLibraries.to_ullong()).constData() - << "\nAll dependencies : " << formatQtModules(result.usedQtLibraries.to_ullong()).constData() - << "\nTo be deployed : " << formatQtModules(result.deployedQtLibraries.to_ullong()).constData() << '\n'; + std::wcout << "Direct dependencies: " << formatQtModules(result.directlyUsedQtLibraries).constData() + << "\nAll dependencies : " << formatQtModules(result.usedQtLibraries).constData() + << "\nTo be deployed : " << formatQtModules(result.deployedQtLibraries).constData() << '\n'; } if (optVerboseLevel > 1)