ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix plugin search dirs

pull/149/head
Michael Zanetti 2019-05-10 12:17:00 +02:00
parent 02b97a686e
commit 0948ffb11e
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libnymea-core/platform/platform.cpp
View File

@ -17,7 +17,7 @@ Platform::Platform(QObject *parent) : QObject(parent)
foreach (const QString &entry, dir.entryList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot)) {
qCDebug(dcPlatform()) << "Found dir entry" << entry;
QFileInfo fi;
if (entry.startsWith("libnymea_systemplugin") && entry.endsWith(".so")) {
if (entry.startsWith("libnymea_platformplugin") && entry.endsWith(".so")) {
fi.setFile(path + "/" + entry);
} else {
fi.setFile(path + "/" + entry + "/libnymea_platformplugin" + entry + ".so");
@ -68,10 +68,19 @@ PlatformUpdateController *Platform::updateController() const
QStringList Platform::pluginSearchDirs() const
{
QStringList ret;
ret << QString(qgetenv("NYMEA_PLATFORM_PLUGINS_PATH")).split(':');
ret << QCoreApplication::applicationDirPath();
return ret;
QStringList searchDirs;
QByteArray envPath = qgetenv("NYMEA_PLATFORM_PLUGINS_PATH");
if (!envPath.isEmpty()) {
searchDirs << QString(envPath).split(':');
}
foreach (QString libraryPath, QCoreApplication::libraryPaths()) {
searchDirs << libraryPath.replace("qt5", "nymea").replace("plugins", "platforms");
}
searchDirs << QCoreApplication::applicationDirPath() + "/../lib/nymea/platforms";
searchDirs << QCoreApplication::applicationDirPath() + "/../platforms/";
searchDirs << QCoreApplication::applicationDirPath() + "/../../../platforms/";
return searchDirs;
}
}