From 42d414797a149b3404edfe384c3a07eb5fb92b38 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Thu, 19 Aug 2021 19:16:22 +0200 Subject: [PATCH] macdeployqt: Formatting --- 3rdparty/macdeployqt/shared.cpp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/3rdparty/macdeployqt/shared.cpp b/3rdparty/macdeployqt/shared.cpp index 71b29886..fa3bfbb2 100644 --- a/3rdparty/macdeployqt/shared.cpp +++ b/3rdparty/macdeployqt/shared.cpp @@ -197,22 +197,19 @@ OtoolInfo findDependencyInfo(const QString &binaryPath) } outputLines.removeFirst(); // remove line containing the binary path - if (binaryPath.contains(".framework/") || binaryPath.endsWith(".dylib")) { const auto match = regexp.match(outputLines.first()); if (match.hasMatch()) { QString installname = match.captured(1); if (QFileInfo(binaryPath).fileName() == QFileInfo(installname).fileName()) { - info.installName = installname; - info.compatibilityVersion = QVersionNumber::fromString(match.captured(2)); - info.currentVersion = QVersionNumber::fromString(match.captured(3)); - outputLines.removeFirst(); + info.installName = installname; + info.compatibilityVersion = QVersionNumber::fromString(match.captured(2)); + info.currentVersion = QVersionNumber::fromString(match.captured(3)); + outputLines.removeFirst(); + } else { + info.installName = binaryPath; } - else { - info.installName = binaryPath; - } - } - else { + } else { LogError() << "Could not parse otool output line:" << outputLines.first(); outputLines.removeFirst(); }