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

See whether this makes any difference for setting the rpath of plugins

Browse Source
This commit is contained in:
probonopd
2017-04-03 21:13:18 +02:00
committed by GitHub
parent 7904b3ce19
commit bace185665
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
@@ -1093,13 +1093,13 @@ void deployPlugins(const AppDirInfo &appDirInfo, const QString &pluginSourcePath
if (copyFilePrintStatus(sourcePath, destinationPath)) { if (copyFilePrintStatus(sourcePath, destinationPath)) {
runStrip(destinationPath); runStrip(destinationPath);
deployQtLibraries(libraries, appDirInfo.path, QStringList() << destinationPath, deploymentInfo.useLoaderPath); deployQtLibraries(libraries, appDirInfo.path, QStringList() << destinationPath, deploymentInfo.useLoaderPath);
/* /* See whether this makes any difference */
// Find out the relative path to the lib/ directory and set it as the rpath // Find out the relative path to the lib/ directory and set it as the rpath
QDir dir(destinationPath); QDir dir(destinationPath);
QString relativePath = dir.relativeFilePath(appDirInfo.path + "/" + libraries[0].libraryDestinationDirectory); QString relativePath = dir.relativeFilePath(appDirInfo.path + "/" + libraries[0].libraryDestinationDirectory);
relativePath.remove(0, 3); // remove initial '../' relativePath.remove(0, 3); // remove initial '../'
changeIdentification("$ORIGIN/" + relativePath, QFileInfo(destinationPath).canonicalFilePath()); changeIdentification("$ORIGIN/" + relativePath, QFileInfo(destinationPath).canonicalFilePath());
*/
} }
} }
} }