diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2020-04-16 09:20:39 +0200 |
|---|---|---|
| committer | cherrypickbot <cherrypickbot@codereview.qt-project.org> | 2020-04-17 08:00:51 +0000 |
| commit | 11459960cdee71a325c7373992adde8fed1db86a (patch) | |
| tree | 1b257381f2e70a4e220dbb21216ec94b2d05ecf3 | |
| parent | 1b992406a6523a144c58baa9bbd1198bb9a2d98c (diff) | |
| download | qttools-11459960cdee71a325c7373992adde8fed1db86a.tar.gz | |
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.
Cherry-picked from branch: dev
Change-Id: I4018d42aa54f4e6434ee6defa119f3c913893819
Reviewed-by: cherrypickbot
| -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 607dce880..a81a2f0d9 100644 --- a/src/macdeployqt/shared/shared.cpp +++ b/src/macdeployqt/shared/shared.cpp @@ -183,7 +183,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); |