Browse Source

Do not bundle dependencies of platformthemes, should fix #236; previous commit led to segfault

master
probonopd 7 years ago
committed by GitHub
parent
commit
a7889b0d83
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,16 +351,16 @@ 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;
ldd.start("ldd", QStringList() << binaryPath); ldd.start("ldd", QStringList() << binaryPath);
ldd.waitForFinished(); ldd.waitForFinished();
if (binaryPath.contains("platformthemes")) {
LogDebug() << "Skipping" << binaryPath << "because we do not bundle dependencies of platformthemes";
return info;
}
if (ldd.exitStatus() != QProcess::NormalExit || ldd.exitCode() != 0) { if (ldd.exitStatus() != QProcess::NormalExit || ldd.exitCode() != 0) {
LogError() << "findDependencyInfo:" << ldd.readAllStandardError(); LogError() << "findDependencyInfo:" << ldd.readAllStandardError();

Loading…
Cancel
Save