X-Git-Url: https://vaikene.ee/gitweb/pswgen11.html?a=blobdiff_plain;f=src%2Flibs%2FPlugins%2Fpluginmanager.h;h=91a5b00947db662addc22238846e0dbd2e5fe00e;hb=de270ece1b764b19968e14420f538321f1c06b15;hp=f79193c1ab89034575fea35550a4d63456be0884;hpb=f26e65c1e66cf02eae9aa209acac743e3b04b4f4;p=evaf

diff --git a/src/libs/Plugins/pluginmanager.h b/src/libs/Plugins/pluginmanager.h
index f79193c..91a5b00 100644
--- a/src/libs/Plugins/pluginmanager.h
+++ b/src/libs/Plugins/pluginmanager.h
@@ -2,7 +2,7 @@
  * @file Plugins/pluginmanager.h
  * @brief Manager for loadable modules (plugins)
  *
- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
@@ -25,6 +25,7 @@
 
 #include <QObject>
 #include <QString>
+#include <QScopedPointer>
 
 namespace eVaf {
 
@@ -58,9 +59,17 @@ namespace Internal {
 inline QString expandPluginName(QString const & name)
 {
 #ifdef Q_OS_WIN32
+#  ifdef Q_CC_MINGW
+    return "lib" + name + ".dll";
+#  else
     return name + ".dll";
+#  endif
 #elif defined Q_OS_LINUX
     return "lib" + name + ".so";
+#elif defined Q_OS_CYGWIN
+    return "cyg" + name + ".dll";
+#elif defined Q_OS_MACOS
+    return "lib" + name + ".dylib";
 #else
     return name;
 #endif
@@ -123,7 +132,7 @@ signals:
 
 private:
 
-    Internal::PluginManagerPrivate * d;
+    QScopedPointer<Internal::PluginManagerPrivate> d;
 
 };