[Qt5] Ported all plugins to Qt5 plugin system

QupZilla.pro

@@ -17,7 +17,4 @@ TEMPLATE = subdirs
 SUBDIRS = src/lib src/main
 CONFIG += ordered
 
-# TODO: Fix plugins for Qt5
+SUBDIRS += src/plugins
-!isEqual(QT_MAJOR_VERSION, 5) {
-    SUBDIRS += src/plugins
-}

src/lib/bookmarks/bookmarkstree.h

@@ -53,6 +53,6 @@ private:
     BookmarkView m_viewType;
 
 signals:
-    void requestNewFolder(QWidget*,QString*,bool,QString,WebView*);
+    void requestNewFolder(QWidget*, QString*, bool, QString, WebView*);
 };
 #endif // BOOKMARKSTREE_H

src/plugins/AccessKeysNavigation/akn_plugin.cpp

@@ -91,4 +91,6 @@ bool AKN_Plugin::keyPress(const Qz::ObjectName &type, QObject* obj, QKeyEvent* e
     return false;
 }
 
+#if QT_VERSION < 0x050000
 Q_EXPORT_PLUGIN2(AccessKeysNavigation, AKN_Plugin)
+#endif

src/plugins/AccessKeysNavigation/akn_plugin.h

@@ -30,6 +30,10 @@ class AKN_Plugin : public QObject, public PluginInterface
     Q_OBJECT
     Q_INTERFACES(PluginInterface)
 
+#if QT_VERSION >= 0x050000
+    Q_PLUGIN_METADATA(IID "QupZilla.Browser.plugin.AKN")
+#endif
+
 public:
     AKN_Plugin();
     PluginSpec pluginSpec();

src/plugins/GreaseMonkey/gm_plugin.cpp

@@ -98,4 +98,6 @@ void GM_Plugin::webPageCreated(WebPage* page)
     connect(page->mainFrame(), SIGNAL(javaScriptWindowObjectCleared()), m_manager, SLOT(pageLoadStart()));
 }
 
+#if QT_VERSION < 0x050000
 Q_EXPORT_PLUGIN2(GreaseMonkey, GM_Plugin)
+#endif

src/plugins/GreaseMonkey/gm_plugin.h

@@ -28,6 +28,10 @@ class GM_Plugin : public QObject, public PluginInterface
     Q_OBJECT
     Q_INTERFACES(PluginInterface)
 
+#if QT_VERSION >= 0x050000
+    Q_PLUGIN_METADATA(IID "QupZilla.Browser.plugin.GreaseMonkey")
+#endif
+
 public:
     explicit GM_Plugin();
     PluginSpec pluginSpec();

src/plugins/MouseGestures/mousegesturesplugin.cpp

@@ -106,4 +106,6 @@ bool MouseGesturesPlugin::mouseMove(const Qz::ObjectName &type, QObject* obj, QM
     return false;
 }
 
+#if QT_VERSION < 0x050000
 Q_EXPORT_PLUGIN2(MouseGestures, MouseGesturesPlugin)
+#endif

src/plugins/MouseGestures/mousegesturesplugin.h

@@ -26,6 +26,10 @@ class MouseGesturesPlugin : public QObject, public PluginInterface
     Q_OBJECT
     Q_INTERFACES(PluginInterface)
 
+#if QT_VERSION >= 0x050000
+    Q_PLUGIN_METADATA(IID "QupZilla.Browser.plugin.MouseGestures")
+#endif
+
 public:
     MouseGesturesPlugin();
     PluginSpec pluginSpec();

src/plugins/PIM/PIM_plugin.cpp

@@ -95,4 +95,6 @@ bool PIM_Plugin::keyPress(const Qz::ObjectName &type, QObject* obj, QKeyEvent* e
     return false;
 }
 
+#if QT_VERSION < 0x050000
 Q_EXPORT_PLUGIN2(PIM, PIM_Plugin)
+#endif

src/plugins/PIM/PIM_plugin.h

@@ -30,6 +30,10 @@ class PIM_Plugin : public QObject, public PluginInterface
     Q_OBJECT
     Q_INTERFACES(PluginInterface)
 
+#if QT_VERSION >= 0x050000
+    Q_PLUGIN_METADATA(IID "QupZilla.Browser.plugin.PIM")
+#endif
+
 public:
     PIM_Plugin();
     PluginSpec pluginSpec();

src/plugins/TestPlugin/testplugin.cpp

@@ -173,4 +173,7 @@ void TestPlugin::actionSlot()
 // Export plugin macro
 // This macro has to be only in class derived from PluginInterface
 // Don't call it in other files!
+
+#if QT_VERSION < 0x050000
 Q_EXPORT_PLUGIN2(ExamplePlugin, TestPlugin)
+#endif

src/plugins/TestPlugin/testplugin.h

@@ -31,13 +31,17 @@
 #include <QMessageBox>
 #include <QWebElement>
 #include <QVBoxLayout>
-#include <QWeakPointer>
+#include <QPointer>
 
 class TestPlugin : public QObject, public PluginInterface
 {
     Q_OBJECT
     Q_INTERFACES(PluginInterface)
 
+#if QT_VERSION >= 0x050000
+    Q_PLUGIN_METADATA(IID "QupZilla.Browser.plugin.TestPlugin")
+#endif
+
 public:
     explicit TestPlugin();
     PluginSpec pluginSpec();
@@ -57,7 +61,7 @@ private slots:
     void actionSlot();
 
 private:
-    QWeakPointer<QDialog> m_settings;
+    QPointer<QDialog> m_settings;
 
     WebView* m_view;
     QString m_settingsPath;