From 53e0ac017ade09238ab72664086baec6282beec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 14 Mar 2022 16:20:10 +0100 Subject: =?UTF-8?q?macdeployqt:=20don=E2=80=99t=20err=20on=20unexpected=20?= =?UTF-8?q?otool=20output?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (cherry-picked from commit 4184a127fa08c3ffafad863f6dde5d4bdc349bf1) Change-Id: Ifc2a37f867b724b9773c578fc2ad018959842482 Reviewed-by: Morten Johan Sørvig --- src/macdeployqt/shared/shared.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/macdeployqt/shared/shared.cpp') 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; } } -- cgit v1.2.1