probonopd
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
5 additions and
5 deletions
-
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()) { |
|
|
|
|
