diff options
| author | Timothée Keller <timothee.keller@qt.io> | 2022-11-21 12:38:15 +0100 |
|---|---|---|
| committer | Timothée Keller <timothee.keller@qt.io> | 2022-12-03 05:45:31 +0100 |
| commit | 58861f78c0822f74744a3285abeb785219b8f96c (patch) | |
| tree | c6189f890e6b627cae5f1f029a930520dc30190d /src/tools/windeployqt/main.cpp | |
| parent | 040aef5b2ffebb0b154d9b6d893424688b0ebdef (diff) | |
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 <oliver.wolff@qt.io>
Diffstat (limited to 'src/tools/windeployqt/main.cpp')
| -rw-r--r-- | src/tools/windeployqt/main.cpp | 9 |
1 files 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<QString, QString> } 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) |