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

Still trying to fight segfault introduced in 22d7667

Browse Source
This commit is contained in:
probonopd
2018-02-10 11:09:52 +00:00
committed by GitHub
parent a7889b0d83
commit bea3474008
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,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()) {