diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2020-04-16 09:20:39 +0200 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2020-04-17 09:26:06 +0200 |
| commit | 359aa3a12e0e37b05c2a96d3e6de58225771fd80 (patch) | |
| tree | 25cb366afbf7fa83d33305b3e541a946d4990d1f /src/macdeployqt/shared | |
| parent | 7e001a437b8c5c7f49a222bfef5a338466c77b0b (diff) | |
Parse the otool line when it has ", weak" as part of the it
With Xcode 11.4, in some cases it will have ", weak" as part of the
framework description when running otool. Therefore we need to account
for this so it still sees it as a valid entry.
Change-Id: I4018d42aa54f4e6434ee6defa119f3c913893819
Pick-to: 5.15
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'src/macdeployqt/shared')
| -rw-r--r-- | src/macdeployqt/shared/shared.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/macdeployqt/shared/shared.cpp b/src/macdeployqt/shared/shared.cpp index 33e243715..748c9a67f 100644 --- a/src/macdeployqt/shared/shared.cpp +++ b/src/macdeployqt/shared/shared.cpp @@ -182,7 +182,7 @@ OtoolInfo findDependencyInfo(const QString &binaryPath) static const QRegularExpression regexp(QStringLiteral( "^\\t(.+) \\(compatibility version (\\d+\\.\\d+\\.\\d+), " - "current version (\\d+\\.\\d+\\.\\d+)\\)$")); + "current version (\\d+\\.\\d+\\.\\d+)(, weak)?\\)$")); QString output = otool.readAllStandardOutput(); QStringList outputLines = output.split("\n", Qt::SkipEmptyParts); |