VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-25 04:53:27 -04:00
Code Issues Projects Releases Wiki Activity

Revert "Removed useless reference to the QPluginLoader in the Plugin structure"

Browse Source 
This reverts commit 1e881d0b2f to avoid future conflicts.
This commit is contained in:
f4exb
2019-05-22 13:49:44 +02:00
parent c500e6f408
commit c99b16f7d7
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdrbase/plugin/pluginmanager.cpp
+2 -2
View File
@@ -163,9 +163,9 @@ void PluginManager::loadPluginsDir(const QDir& dir)
qWarning() << "PluginManager::loadPluginsDir: " << qPrintable(loader->errorString());
}
if (plugin)
if (plugin != 0)
{
m_plugins.append(Plugin(fileName, plugin));
m_plugins.append(Plugin(fileName, loader, plugin));
}
else
{
sdrbase/plugin/pluginmanager.h
+3 -1
View File
@@ -42,10 +42,12 @@ public:
struct Plugin
{
QString filename;
QPluginLoader* loader;
PluginInterface* pluginInterface;
Plugin(const QString& _filename, PluginInterface* _plugin) :
Plugin(const QString& _filename, QPluginLoader* pluginLoader, PluginInterface* _plugin) :
filename(_filename),
loader(pluginLoader),
pluginInterface(_plugin)
{ }
};