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

This reverts commit 1e881d0b2f to avoid future conflicts.
pull/351/head
f4exb 2019-05-22 13:49:44 +02:00
rodzic c500e6f408
commit c99b16f7d7
2 zmienionych plików z 5 dodań i 3 usunięć

Wyświetl plik

@ -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
{

Wyświetl plik

@ -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)
{ }
};