diff --git a/libnymea-core/devices/devicemanagerimplementation.cpp b/libnymea-core/devices/devicemanagerimplementation.cpp index 04dc236f..48c365e5 100644 --- a/libnymea-core/devices/devicemanagerimplementation.cpp +++ b/libnymea-core/devices/devicemanagerimplementation.cpp @@ -107,7 +107,10 @@ QStringList DeviceManagerImplementation::pluginSearchDirs() foreach (QString libraryPath, QCoreApplication::libraryPaths()) { searchDirs << libraryPath.replace("qt5", "nymea"); } - searchDirs << QDir(QCoreApplication::applicationDirPath() + "/../lib/nymea/plugins").absolutePath(); + foreach (QString libraryPath, QCoreApplication::libraryPaths()) { + searchDirs << libraryPath.replace("plugins", "nymea/plugins"); + } + searchDirs << QDir(QCoreApplication::applicationDirPath() + "/../lib/nymea/plugins/").absolutePath(); searchDirs << QDir(QCoreApplication::applicationDirPath() + "/../plugins/").absolutePath(); searchDirs << QDir(QCoreApplication::applicationDirPath() + "/../../../plugins/").absolutePath(); searchDirs.removeDuplicates(); diff --git a/libnymea-core/platform/platform.cpp b/libnymea-core/platform/platform.cpp index d149c9b4..71d178ed 100644 --- a/libnymea-core/platform/platform.cpp +++ b/libnymea-core/platform/platform.cpp @@ -102,7 +102,10 @@ QStringList Platform::pluginSearchDirs() const foreach (QString libraryPath, QCoreApplication::libraryPaths()) { searchDirs << libraryPath.replace("qt5", "nymea").replace("plugins", "platform"); } - searchDirs << QCoreApplication::applicationDirPath() + "/../lib/nymea/platform"; + foreach (QString libraryPath, QCoreApplication::libraryPaths()) { + searchDirs << libraryPath.replace("plugins", "nymea/platform"); + } + searchDirs << QCoreApplication::applicationDirPath() + "/../lib/nymea/platform/"; searchDirs << QCoreApplication::applicationDirPath() + "/../platform/"; searchDirs << QCoreApplication::applicationDirPath() + "/../../../platform/"; return searchDirs;