From a1a4923ba3ff4efc4f094c8793d65fa93c8b59db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=80lex=20Fiestas?= Date: Thu, 16 Mar 2017 12:04:09 +0100 Subject: [PATCH] Exclude /usr/local from being detected as "Distribution Qt" /usr/local is the canonical place to put self built applications and libraries so it should be exlucded from the logic to detect distribution shipped Qt. --- shared/shared.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/shared.cpp b/shared/shared.cpp index b025458..3d2ab4f 100644 --- a/shared/shared.cpp +++ b/shared/shared.cpp @@ -810,7 +810,7 @@ DeploymentInfo deployQtLibraries(const QString &appDirPath, const QStringList &a setenv("LD_LIBRARY_PATH",newPath.toUtf8().constData(),1); } - if(qtLibsPath.startsWith("/usr/")){ + if(qtLibsPath.startsWith("/usr/") && !qtLibsPath.startsWith("/usr/local")){ LogError() << "Bundling Qt provided by distributions is not yet supported by this tool."; LogError() << "Please see https://github.com/probonopd/linuxdeployqt/issues/79 and"; LogError() << "submit a Pull Request to implement this.";