Browse Source

Still trying to fight segfault introduced in 22d7667

master
probonopd 7 years ago
committed by GitHub
parent
commit
bea3474008
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      tools/linuxdeployqt/shared.cpp

10
tools/linuxdeployqt/shared.cpp

@ -351,11 +351,6 @@ LddInfo findDependencyInfo(const QString &binaryPath)
LddInfo info; LddInfo info;
info.binaryPath = binaryPath; info.binaryPath = binaryPath;
if (binaryPath.contains("platformthemes")) {
LogDebug() << "Not running ldd on" << binaryPath << "because we do not bundle dependencies of platformthemes";
return info;
}
LogDebug() << "Using ldd:"; LogDebug() << "Using ldd:";
LogDebug() << " inspecting" << binaryPath; LogDebug() << " inspecting" << binaryPath;
QProcess ldd; QProcess ldd;
@ -406,6 +401,11 @@ LddInfo findDependencyInfo(const QString &binaryPath)
outputLines.removeFirst(); outputLines.removeFirst();
} }
if (binaryPath.contains("platformthemes")) {
LogDebug() << "Not adding dependencies of" << binaryPath << "because we do not bundle dependencies of platformthemes";
return info;
}
foreach (const QString &outputLine, outputLines) { foreach (const QString &outputLine, outputLines) {
const QRegularExpressionMatch match = regexp.match(outputLine); const QRegularExpressionMatch match = regexp.match(outputLine);
if (match.hasMatch()) { if (match.hasMatch()) {

Loading…
Cancel
Save