From a7889b0d831b5da5affd4ebde2835b1d4c3f9667 Mon Sep 17 00:00:00 2001 From: probonopd Date: Sat, 10 Feb 2018 10:49:33 +0000 Subject: [PATCH] Do not bundle dependencies of platformthemes, should fix #236; previous commit led to segfault --- tools/linuxdeployqt/shared.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/linuxdeployqt/shared.cpp b/tools/linuxdeployqt/shared.cpp index 38aa9c4..8e5141a 100644 --- a/tools/linuxdeployqt/shared.cpp +++ b/tools/linuxdeployqt/shared.cpp @@ -351,16 +351,16 @@ LddInfo findDependencyInfo(const QString &binaryPath) LddInfo info; 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() << " inspecting" << binaryPath; QProcess ldd; ldd.start("ldd", QStringList() << binaryPath); 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) { LogError() << "findDependencyInfo:" << ldd.readAllStandardError();