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

Do not bundle dependencies of platformthemes, should fix #236

Browse Source
This commit is contained in:
probonopd
2018-02-10 10:33:31 +00:00
committed by GitHub
parent ec23a7a62e
commit 22d766797f
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/linuxdeployqt/shared.cpp
+6 -1
View File
@@ -357,6 +357,11 @@ LddInfo findDependencyInfo(const QString &binaryPath)
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();
return info; return info;
@@ -391,7 +396,7 @@ LddInfo findDependencyInfo(const QString &binaryPath)
} }
} }
if ((binaryPath.contains(".so.") || binaryPath.endsWith(".so")) && (!lddOutputContainsLinuxVDSO(output)) && (!binaryPath.contains("platformthemes"))) { if ((binaryPath.contains(".so.") || binaryPath.endsWith(".so")) && (!lddOutputContainsLinuxVDSO(output))) {
const QRegularExpressionMatch match = regexp.match(outputLines.first()); const QRegularExpressionMatch match = regexp.match(outputLines.first());
if (match.hasMatch()) { if (match.hasMatch()) {
info.installName = match.captured(1); info.installName = match.captured(1);