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

Exclude /usr/local from being detected as "Distribution Qt"

Browse Source 
/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.
This commit is contained in:
Àlex Fiestas
2017-03-16 12:04:09 +01:00
parent ac9e9db2d0
commit a1a4923ba3
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/shared.cpp
+1 -1
View File
@@ -810,7 +810,7 @@ DeploymentInfo deployQtLibraries(const QString &appDirPath, const QStringList &a
setenv("LD_LIBRARY_PATH",newPath.toUtf8().constData(),1); 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() << "Bundling Qt provided by distributions is not yet supported by this tool.";
LogError() << "Please see https://github.com/probonopd/linuxdeployqt/issues/79 and"; LogError() << "Please see https://github.com/probonopd/linuxdeployqt/issues/79 and";
LogError() << "submit a Pull Request to implement this."; LogError() << "submit a Pull Request to implement this.";