Merge pull request #62 from atehxx/patch-2

Improve bundling of Qt libs
probonopd · Feb 5, 2017 · 334930b · 334930b
2 parents 74ca072 + a680de5
commit 334930b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/shared/shared.cpp b/shared/shared.cpp
@@ -257,8 +257,8 @@ LibraryInfo parseLddLibraryLine(const QString &line, const QString &appDirPath,
         With the Qt provided by qt.io the libicu libraries come bundled, but that is not the case with e.g.,
         Qt from ppas. Hence we make sure libicu is always bundled since it cannot be assumed to be on target sytems
         */
-
-        if (! trimmed.contains("libicu")) {
+        // Manual make of Qt deploys it to /usr/local/Qt-x.x.x so we cannot remove this path just like that, so let's allow known libs of Qt.
+        if (!trimmed.contains("libicu") && !trimmed.contains("lib/libQt") && !trimmed.contains("lib/libqgsttools")) {
             if ((trimmed.startsWith("/usr") or (trimmed.startsWith("/lib")))) {
                 return info;
             }