From 4184a127fa08c3ffafad863f6dde5d4bdc349bf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= Date: Tue, 14 Dec 2021 21:41:31 +0100 Subject: [PATCH] =?UTF-8?q?macdeployqt:=20don=E2=80=99t=20err=20on=20unexp?= =?UTF-8?q?ected=20otool=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. Pick-to: 6.3 Task-number: QTBUG-98466 Change-Id: I0afebdc0dd19e76de00157518f3409d690f18fc0 Reviewed-by: Timur Pocheptsov --- src/tools/macdeployqt/shared/shared.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp index b6eeaa8e80..584b541c9a 100644 --- a/src/tools/macdeployqt/shared/shared.cpp +++ b/src/tools/macdeployqt/shared/shared.cpp @@ -206,7 +206,7 @@ OtoolInfo findDependencyInfo(const QString &binaryPath) info.installName = binaryPath; } } else { - LogError() << "Could not parse otool output line:" << outputLines.first(); + LogDebug() << "Could not parse otool output line:" << outputLines.first(); outputLines.removeFirst(); } } @@ -220,7 +220,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; } }