From a680de5b2b07d89207a8bd46da6ce08e2a69406a Mon Sep 17 00:00:00 2001
From: Manio <atehxx@gmail.com>
Date: Mon, 30 Jan 2017 18:06:57 +0100
Subject: [PATCH] Improve bundling of Qt libs

Workaround for not bundling Qt libs when Qt is installed in /usr/local/Qt...
---
 shared/shared.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shared/shared.cpp b/shared/shared.cpp
index 7332cb3..86c77b8 100644
--- 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;
             }