TianZD/linuxdeployqt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
probonopd
2018-02-10 10:49:33 +00:00
committed by GitHub
parent 22d766797f
commit a7889b0d83
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/linuxdeployqt/shared.cpp
+5 -5
View File
@@ -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();