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

Tell users about the workaround for #2 until it is fixed

Browse Source
This commit is contained in:
probonopd
2016-09-08 16:28:19 +02:00
committed by GitHub
parent 43e8640d90
commit 0b91936ca9
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/shared.cpp
+3 -4
View File
@@ -680,10 +680,12 @@ DeploymentInfo deployQtLibraries(const QString &appDirPath, const QStringList &a
QList<LibraryInfo> libraries = getQtLibrariesForPaths(allBinaryPaths, appDirPath, allRPaths); QList<LibraryInfo> libraries = getQtLibrariesForPaths(allBinaryPaths, appDirPath, allRPaths);
if (libraries.isEmpty() && !alwaysOwerwriteEnabled) { if (libraries.isEmpty() && !alwaysOwerwriteEnabled) {
LogWarning() << "Could not find any external Qt libraries to deploy in" << appDirPath; LogWarning() << "Could not find any external Qt libraries to deploy in" << appDirPath;
LogWarning() << "Perhaps linuxdeployqt was already used on" << appDirPath << "?"; LogWarning() << "Perhaps linuxdeployqt was already used on" << appDirPath << "?";
LogWarning() << "If so, you will need to rebuild" << appDirPath << "before trying again."; LogWarning() << "If so, you will need to rebuild" << appDirPath << "before trying again.";
LogWarning() << "Or ldd does not find the external Qt libraries but sees the system ones.";
LogWarning() << "If so, you will need to set LD_LIBRARY_PATH to the directory containing the external Qt libraries before trying again.";
LogWarning() << "FIXME: https://github.com/probonopd/linuxdeployqt/issues/2";
return DeploymentInfo(); return DeploymentInfo();
} else { } else {
return deployQtLibraries(libraries, applicationBundle.path, allBinaryPaths, !additionalExecutables.isEmpty()); return deployQtLibraries(libraries, applicationBundle.path, allBinaryPaths, !additionalExecutables.isEmpty());
@@ -752,9 +754,6 @@ void deployPlugins(const AppDirInfo &appDirInfo, const QString &pluginSourcePath
const QString destinationPath = pluginDestinationPath + "/" + plugin; const QString destinationPath = pluginDestinationPath + "/" + plugin;
QDir dir; QDir dir;
dir.mkpath(QFileInfo(destinationPath).path()); dir.mkpath(QFileInfo(destinationPath).path());
LogError() << "FIXME: Need to scan" << destinationPath << "for additional dependencies (this is not yorking yet)";
LogError() << "FIXME: Update deploymentInfo.deployedLibraries - the plugins";
LogError() << "FIXME: will have brought in extra libraries as dependencies (e.g., plugins/platforms/libqxcb.so needs libQt5XcbQpa.so.5)";
deploymentInfo.deployedLibraries += findAppLibraries(destinationPath); deploymentInfo.deployedLibraries += findAppLibraries(destinationPath);
deploymentInfo.deployedLibraries = deploymentInfo.deployedLibraries.toSet().toList(); deploymentInfo.deployedLibraries = deploymentInfo.deployedLibraries.toSet().toList();