From bea3474008ab4976069778303189f88286460270 Mon Sep 17 00:00:00 2001 From: probonopd Date: Sat, 10 Feb 2018 11:09:52 +0000 Subject: [PATCH] Still trying to fight segfault introduced in 22d7667 --- 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 8e5141a..c5561fe 100644 --- a/tools/linuxdeployqt/shared.cpp +++ b/tools/linuxdeployqt/shared.cpp @@ -351,11 +351,6 @@ 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; @@ -406,6 +401,11 @@ LddInfo findDependencyInfo(const QString &binaryPath) 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) { const QRegularExpressionMatch match = regexp.match(outputLine); if (match.hasMatch()) {