VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Server version: changed plugin lookup locations

This commit is contained in:
f4exb 2017-12-16 13:39:13 +01:00
parent 3169083013
commit 20c69adedf
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sdrbase/plugin/pluginmanager.cpp
View File

@ -56,14 +56,24 @@ PluginManager::~PluginManager()
void PluginManager::loadPlugins()
{
QString applicationDirPath = QCoreApplication::instance()->applicationDirPath();
QString applicationLibPath = applicationDirPath + "/../lib";
qDebug() << "PluginManager::loadPlugins: " << qPrintable(applicationDirPath) << ", " << qPrintable(applicationLibPath);
QString applicationLibPath = applicationDirPath + "/lib/plugins";
QString applicationBuildPath = applicationDirPath + "/plugins";
qDebug() << "PluginManager::loadPlugins: " << qPrintable(applicationLibPath) << "," << qPrintable(applicationBuildPath);
QDir pluginsBinDir = QDir(applicationDirPath);
QDir pluginsLibDir = QDir(applicationLibPath);
QDir pluginsLibDir = QDir(applicationLibPath);
QDir pluginsBuildDir = QDir(applicationBuildPath);
loadPlugins(pluginsBinDir);
loadPlugins(pluginsLibDir);
loadPlugins(pluginsLibDir);
loadPlugins(pluginsBuildDir);
// QString applicationLibPath = applicationDirPath + "/../lib/plugins";
// qDebug() << "PluginManager::loadPlugins: " << qPrintable(applicationDirPath) << ", " << qPrintable(applicationLibPath);
//
// QDir pluginsBinDir = QDir(applicationDirPath);
// QDir pluginsLibDir = QDir(applicationLibPath);
//
// loadPlugins(pluginsBinDir);
// loadPlugins(pluginsLibDir);
qSort(m_plugins);