whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.

Pick-to: 6.3
Task-number: QTBUG-98466
Change-Id: I0afebdc0dd19e76de00157518f3409d690f18fc0
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
bb10
Morten Johan Sørvig 2021-12-14 21:41:31 +01:00
parent fc89d92150
commit 4184a127fa
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tools/macdeployqt/shared/shared.cpp
View File

@ -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;
}
}