Merge

1 files changed, 2 insertions, 2 deletions

diff --git a/src/plugincontainer.cpp b/src/plugincontainer.cpp
index 738a4cec..f741e0dc 100644
--- a/src/plugincontainer.cpp
+++ b/src/plugincontainer.cpp
@@ -266,7 +266,7 @@ void PluginContainer::loadPlugins()
     loadCheck.flush();

     QString pluginName = iter.filePath();

     if (QLibrary::isLibrary(pluginName)) {

-      QPluginLoader *pluginLoader = new QPluginLoader(pluginName, this);

+      std::unique_ptr<QPluginLoader> pluginLoader(new QPluginLoader(pluginName, this));

       if (pluginLoader->instance() == nullptr) {

         m_FailedPlugins.push_back(pluginName);

         qCritical("failed to load plugin %s: %s",

@@ -274,7 +274,7 @@ void PluginContainer::loadPlugins()
       } else {

         if (registerPlugin(pluginLoader->instance(), pluginName)) {

           qDebug("loaded plugin \"%s\"", qPrintable(QFileInfo(pluginName).fileName()));

-          m_PluginLoaders.push_back(pluginLoader);

+          m_PluginLoaders.push_back(pluginLoader.release());

         } else {

           m_FailedPlugins.push_back(pluginName);

           qWarning("plugin \"%s\" failed to load", qPrintable(pluginName));