From d3579c6262a9380b563b00c8db3eac43ed15f430 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Sat, 11 Oct 2014 04:03:41 +0200 Subject: [PATCH] fix search paths --- libguh/devicemanager.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libguh/devicemanager.cpp b/libguh/devicemanager.cpp index df78a3b9..9bdc8d1c 100644 --- a/libguh/devicemanager.cpp +++ b/libguh/devicemanager.cpp @@ -514,15 +514,15 @@ void DeviceManager::loadPlugins() { QStringList searchDirs; - searchDirs << QCoreApplication::applicationDirPath() + "/../lib/guh"; - searchDirs << QCoreApplication::applicationDirPath() + "/../"; - searchDirs << QCoreApplication::applicationDirPath() + "/../../../"; + searchDirs << QCoreApplication::applicationDirPath() + "/../lib/guh/guh"; + searchDirs << QCoreApplication::applicationDirPath() + "/../plugins/deviceplugins"; + searchDirs << QCoreApplication::applicationDirPath() + "/../../../plugins/deviceplugins"; foreach (const QString &path, searchDirs) { - QDir dir(path + "/plugins/deviceplugins"); + QDir dir(path); qDebug() << "Loading plugins from:" << dir.absolutePath(); foreach (const QString &entry, dir.entryList()) { - QFileInfo fi(path + "/plugins/deviceplugins/" + entry + "/libguh_deviceplugin" + entry + ".so"); + QFileInfo fi(path + "/" + entry + "/libguh_deviceplugin" + entry + ".so"); if (!fi.exists()) { continue; }