diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-22 10:12:13 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-22 10:12:14 +0200 |
| commit | 95cd9078938bcd88fdfbba707911e8111f59f195 (patch) | |
| tree | c55231a843255c0e8fa7d6c94fbf54bc1a9bb9a7 /src/macdeployqt/shared/shared.cpp | |
| parent | 1b992406a6523a144c58baa9bbd1198bb9a2d98c (diff) | |
| parent | b3cdd63d4bdaea09222fb93ffcd5104a2dc0bf2e (diff) | |
| download | qttools-95cd9078938bcd88fdfbba707911e8111f59f195.tar.gz | |
Merge remote-tracking branch 'origin/5.15' into 5.15.0
Change-Id: I1fdd80c6b7c2615815acc262f01a3893d28406a3
Diffstat (limited to 'src/macdeployqt/shared/shared.cpp')
| -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); |