TianZD/linuxdeployqt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #62 from atehxx/patch-2

Browse Source 
Improve bundling of Qt libs
This commit is contained in:
probonopd
2017-02-05 21:49:59 +01:00
committed by GitHub
parent 74ca072c7f a680de5b2b
commit 334930bfaa
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/shared.cpp
+2 -2
View File
@@ -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., 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 Qt from ppas. Hence we make sure libicu is always bundled since it cannot be assumed to be on target sytems
*/ */
// 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")) { if (!trimmed.contains("libicu") && !trimmed.contains("lib/libQt") && !trimmed.contains("lib/libqgsttools")) {
if ((trimmed.startsWith("/usr") or (trimmed.startsWith("/lib")))) { if ((trimmed.startsWith("/usr") or (trimmed.startsWith("/lib")))) {
return info; return info;
} }