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

Windeployqt: Simplify infix detection for --libinfix builds

Browse Source 
Removed fetching the infix through the QtCore Module, since
it is already provided by qtpaths -query

Pick-to: 6.5
Change-Id: I844305fc66b21af094724dd3f516078447ee1dd2
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
This commit is contained in:
Timothée Keller 2022-12-19 16:42:51 +01:00
parent aa6339594e
commit a81fa2047b
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1027,18 +1027,18 @@ struct DeployResult
}; };
static QString libraryPath(const QString &libraryLocation, const char *name, static QString libraryPath(const QString &libraryLocation, const char *name,
const QString &qtLibInfix, Platform platform, bool debug) const QString &infix, Platform platform, bool debug)
{ {
QString result = libraryLocation + u'/'; QString result = libraryLocation + u'/';
if (platform & WindowsBased) { if (platform & WindowsBased) {
result += QLatin1StringView(name); result += QLatin1StringView(name);
result += qtLibInfix; result += infix;
if (debug && platformHasDebugSuffix(platform)) if (debug && platformHasDebugSuffix(platform))
result += u'd'; result += u'd';
} else if (platform.testFlag(UnixBased)) { } else if (platform.testFlag(UnixBased)) {
result += QStringLiteral("lib"); result += QStringLiteral("lib");
result += QLatin1StringView(name); result += QLatin1StringView(name);
result += qtLibInfix; result += infix;
} }
result += sharedLibrarySuffix(platform); result += sharedLibrarySuffix(platform);
return result; return result;
@ -1159,16 +1159,6 @@ static inline int qtVersion(const QMap<QString, QString> &qtpathsVariables)
return (majorVersion << 16) | (minorVersion << 8) | patchVersion; return (majorVersion << 16) | (minorVersion << 8) | patchVersion;
} }
// Determine the Qt lib infix from the library path of "Qt6Core<qtblibinfix>[d].dll".
static inline QString qtlibInfixFromCoreLibName(const QString &path, bool isDebug, Platform platform)
{
const qsizetype startPos = path.lastIndexOf(u'/') + 8;
qsizetype endPos = path.lastIndexOf(u'.');
if (isDebug && (platform & WindowsBased))
endPos--;
return endPos > startPos ? path.mid(startPos, endPos - startPos) : QString();
}
// Deploy a library along with its .pdb debug info file (MSVC) should it exist. // Deploy a library along with its .pdb debug info file (MSVC) should it exist.
static bool updateLibrary(const QString &sourceFileName, const QString &targetDirectory, static bool updateLibrary(const QString &sourceFileName, const QString &targetDirectory,
const Options &options, QString *errorMessage) const Options &options, QString *errorMessage)
@ -1257,12 +1247,9 @@ static DeployResult deploy(const Options &options, const QMap<QString, QString>
// Determine application type, check Quick2 is used by looking at the // Determine application type, check Quick2 is used by looking at the
// direct dependencies (do not be fooled by QtWebKit depending on it). // direct dependencies (do not be fooled by QtWebKit depending on it).
QString qtLibInfix;
for (int m = 0; m < dependentQtLibs.size(); ++m) { for (int m = 0; m < dependentQtLibs.size(); ++m) {
const quint64 module = qtModule(dependentQtLibs.at(m), infix); const quint64 module = qtModule(dependentQtLibs.at(m), infix);
result.directlyUsedQtLibraries[module] = 1; result.directlyUsedQtLibraries[module] = 1;
if (module == QtCoreModuleId)
qtLibInfix = qtlibInfixFromCoreLibName(dependentQtLibs.at(m), detectedDebug, options.platform);
} }
const bool usesQml = result.directlyUsedQtLibraries.test(QtQmlModuleId); const bool usesQml = result.directlyUsedQtLibraries.test(QtQmlModuleId);
@ -1397,7 +1384,7 @@ static DeployResult deploy(const Options &options, const QMap<QString, QString>
QString qtGuiLibrary; QString qtGuiLibrary;
for (const auto &qtModule : qtModuleEntries) { for (const auto &qtModule : qtModuleEntries) {
if (result.deployedQtLibraries.test(qtModule.id)) { if (result.deployedQtLibraries.test(qtModule.id)) {
const QString library = libraryPath(libraryLocation, qtModule.name.toUtf8(), qtLibInfix, const QString library = libraryPath(libraryLocation, qtModule.name.toUtf8(), infix,
options.platform, result.isDebug); options.platform, result.isDebug);
deployedQtLibraries.append(library); deployedQtLibraries.append(library);
if (qtModule.id == QtGuiModuleId) if (qtModule.id == QtGuiModuleId)
@ -1451,7 +1438,7 @@ static DeployResult deploy(const Options &options, const QMap<QString, QString>
#if !QT_CONFIG(relocatable) #if !QT_CONFIG(relocatable)
if (options.patchQt && !options.dryRun) { if (options.patchQt && !options.dryRun) {
const QString qt6CoreName = QFileInfo(libraryPath(libraryLocation, "Qt6Core", qtLibInfix, const QString qt6CoreName = QFileInfo(libraryPath(libraryLocation, "Qt6Core", infix,
options.platform, result.isDebug)).fileName(); options.platform, result.isDebug)).fileName();
if (!patchQtCore(targetPath + u'/' + qt6CoreName, errorMessage)) { if (!patchQtCore(targetPath + u'/' + qt6CoreName, errorMessage)) {
std::wcerr << "Warning: " << *errorMessage << '\n'; std::wcerr << "Warning: " << *errorMessage << '\n';