diff --git a/shared/shared.cpp b/shared/shared.cpp index 14c5a40..2f9d8cb 100644 --- a/shared/shared.cpp +++ b/shared/shared.cpp @@ -976,7 +976,8 @@ void deployPlugins(const AppDirInfo &appDirInfo, const QString &pluginSourcePath void createQtConf(const QString &appDirPath) { - // Set Plugins and imports paths. These are relative to App.app/Contents. + // Set Plugins and imports paths. These are relative to QCoreApplication::applicationDirPath() + // which is where the main executable resides; see http://doc.qt.io/qt-5/qt-conf.html QByteArray contents = "# Generated by linuxdeployqt\n" "# https://github.com/probonopd/linuxdeployqt/\n" "[Paths]\n" @@ -984,6 +985,17 @@ void createQtConf(const QString &appDirPath) "Imports = qml\n" "Qml2Imports = qml\n"; + // Workaround for: https://github.com/probonopd/linuxdeployqt/issues/75 + if(fhsLikeMode == true){ + QByteArray contents = "# Generated by linuxdeployqt\n" + "# https://github.com/probonopd/linuxdeployqt/\n" + "[Paths]\n" + "Prefix = ../../\n" + "Plugins = plugins\n" + "Imports = qml\n" + "Qml2Imports = qml\n"; + } + QString filePath = appDirPath + "/"; // Is picked up when placed next to the main executable QString fileName = QDir::cleanPath(appBinaryPath + "/../qt.conf");