dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

macdeployqt: Formatting

Browse Source
This commit is contained in:
Jonas Kvinge
2021-08-19 19:16:22 +02:00
parent b071a4df70
commit 42d414797a
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
3rdparty/macdeployqt/shared.cpp vendored
View File

@@ -197,7 +197,6 @@ OtoolInfo findDependencyInfo(const QString &binaryPath)
} }
outputLines.removeFirst(); // remove line containing the binary path outputLines.removeFirst(); // remove line containing the binary path
if (binaryPath.contains(".framework/") || binaryPath.endsWith(".dylib")) { if (binaryPath.contains(".framework/") || binaryPath.endsWith(".dylib")) {
const auto match = regexp.match(outputLines.first()); const auto match = regexp.match(outputLines.first());
if (match.hasMatch()) { if (match.hasMatch()) {
@@ -207,12 +206,10 @@ OtoolInfo findDependencyInfo(const QString &binaryPath)
info.compatibilityVersion = QVersionNumber::fromString(match.captured(2)); info.compatibilityVersion = QVersionNumber::fromString(match.captured(2));
info.currentVersion = QVersionNumber::fromString(match.captured(3)); info.currentVersion = QVersionNumber::fromString(match.captured(3));
outputLines.removeFirst(); outputLines.removeFirst();
} } else {
else {
info.installName = binaryPath; info.installName = binaryPath;
} }
} } else {
else {
LogError() << "Could not parse otool output line:" << outputLines.first(); LogError() << "Could not parse otool output line:" << outputLines.first();
outputLines.removeFirst(); outputLines.removeFirst();
} }