Browse Source

Improve bundling of Qt libs

Workaround for not bundling Qt libs when Qt is installed in /usr/local/Qt...
master
Manio 8 years ago
committed by GitHub
parent
commit
a680de5b2b
  1. 4
      shared/shared.cpp

4
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., 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;
} }

Loading…
Cancel
Save