diff options
author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2022-03-14 16:20:10 +0100 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2022-03-14 17:20:07 +0000 |
commit | 53e0ac017ade09238ab72664086baec6282beec9 (patch) | |
tree | a55bff8c566c48d07ef8da567fe121db3bfcc5b7 | |
parent | fed9bcfc97ade6366c8f5a4559607daf18befb57 (diff) | |
download | qttools-53e0ac017ade09238ab72664086baec6282beec9.tar.gz |
macdeployqt: don’t err on unexpected otool output
Binaries with multiple slices (e.g. arm64, x86_64)
will have an extra line for the slice, like:
“/path/to/QtGui.framework/QtGui (architecture arm64)”
The parsing code will skip this line since it does
not match the regexp. In other words the parsing works
by looking for lines which matches, and finding lines
which don’t match is not an error condition.
Task-number: QTBUG-98466
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
(cherry-picked from commit 4184a127fa08c3ffafad863f6dde5d4bdc349bf1)
Change-Id: Ifc2a37f867b724b9773c578fc2ad018959842482
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
-rw-r--r-- | src/macdeployqt/shared/shared.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/macdeployqt/shared/shared.cpp b/src/macdeployqt/shared/shared.cpp index 52597209d..85653cee7 100644 --- a/src/macdeployqt/shared/shared.cpp +++ b/src/macdeployqt/shared/shared.cpp @@ -200,7 +200,7 @@ OtoolInfo findDependencyInfo(const QString &binaryPath) info.compatibilityVersion = QVersionNumber::fromString(match.captured(2)); info.currentVersion = QVersionNumber::fromString(match.captured(3)); } else { - LogError() << "Could not parse otool output line:" << outputLines.first(); + LogDebug() << "Could not parse otool output line:" << outputLines.first(); } outputLines.removeFirst(); } @@ -214,7 +214,7 @@ OtoolInfo findDependencyInfo(const QString &binaryPath) dylib.currentVersion = QVersionNumber::fromString(match.captured(3)); info.dependencies << dylib; } else { - LogError() << "Could not parse otool output line:" << outputLine; + LogDebug() << "Could not parse otool output line:" << outputLine; } } |