Migrate evdev plugins to the new plugin system

Change-Id: I7eb283646b7529080c8c2f41c267b0135c8f57e4
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

diff --git a/src/plugins/generic/evdevkeyboard/evdevkeyboard.json b/src/plugins/generic/evdevkeyboard/evdevkeyboard.json
new file mode 100644 (file)
index 0000000..0e24bb0
--- /dev/null
+++ b/src/plugins/generic/evdevkeyboard/evdevkeyboard.json
@@ -0,0 +1,3 @@
+{
+    "Keys": [ "EvdevKeyboard" ]
+}

diff --git a/src/plugins/generic/evdevkeyboard/evdevkeyboard.pro b/src/plugins/generic/evdevkeyboard/evdevkeyboard.pro
index 997a58e..47608b7 100644 (file)
--- a/src/plugins/generic/evdevkeyboard/evdevkeyboard.pro
+++ b/src/plugins/generic/evdevkeyboard/evdevkeyboard.pro
@@ -17,3 +17,6 @@ LIBS += -ludev
 SOURCES = main.cpp \
     qevdevkeyboardhandler.cpp \
     qevdevkeyboardmanager.cpp
+
+OTHER_FILES += \
+    evdevkeyboard.json

diff --git a/src/plugins/generic/evdevkeyboard/main.cpp b/src/plugins/generic/evdevkeyboard/main.cpp
index 6df4e29..71d1572 100644 (file)
--- a/src/plugins/generic/evdevkeyboard/main.cpp
+++ b/src/plugins/generic/evdevkeyboard/main.cpp
@@ -46,6 +46,9 @@ QT_BEGIN_NAMESPACE
 
 class QEvdevKeyboardPlugin : public QGenericPlugin
 {
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QGenericPluginFactoryInterface" FILE "evdevkeyboard.json")
+
 public:
     QEvdevKeyboardPlugin();
 
@@ -72,6 +75,6 @@ QObject* QEvdevKeyboardPlugin::create(const QString &key,
     return 0;
 }
 
-Q_EXPORT_PLUGIN2(qevdevkeyboardplugin, QEvdevKeyboardPlugin)
-
 QT_END_NAMESPACE
+
+#include "main.moc"

diff --git a/src/plugins/generic/evdevmouse/evdevmouse.json b/src/plugins/generic/evdevmouse/evdevmouse.json
new file mode 100644 (file)
index 0000000..00ddd3a
--- /dev/null
+++ b/src/plugins/generic/evdevmouse/evdevmouse.json
@@ -0,0 +1,3 @@
+{
+    "Keys": [ "EvdevMouse" ]
+}

diff --git a/src/plugins/generic/evdevmouse/evdevmouse.pro b/src/plugins/generic/evdevmouse/evdevmouse.pro
index f251991..c5d162f 100644 (file)
--- a/src/plugins/generic/evdevmouse/evdevmouse.pro
+++ b/src/plugins/generic/evdevmouse/evdevmouse.pro
@@ -11,3 +11,6 @@ QT += core-private platformsupport-private
 
 SOURCES = main.cpp \
           qevdevmouse.cpp
+
+OTHER_FILES += \
+    evdevmouse.json

diff --git a/src/plugins/generic/evdevmouse/main.cpp b/src/plugins/generic/evdevmouse/main.cpp
index 34ca62f..47a4ddf 100644 (file)
--- a/src/plugins/generic/evdevmouse/main.cpp
+++ b/src/plugins/generic/evdevmouse/main.cpp
@@ -46,6 +46,9 @@ QT_BEGIN_NAMESPACE
 
 class QEvdevMousePlugin : public QGenericPlugin
 {
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QGenericPluginFactoryInterface" FILE "evdevmouse.json")
+
 public:
     QEvdevMousePlugin();
 
@@ -72,6 +75,6 @@ QObject* QEvdevMousePlugin::create(const QString &key,
     return 0;
 }
 
-Q_EXPORT_PLUGIN2(qevdevmouseplugin, QEvdevMousePlugin)
-
 QT_END_NAMESPACE
+
+#include "main.moc"

diff --git a/src/plugins/generic/evdevtouch/evdevtouch.json b/src/plugins/generic/evdevtouch/evdevtouch.json
new file mode 100644 (file)
index 0000000..6a6959c
--- /dev/null
+++ b/src/plugins/generic/evdevtouch/evdevtouch.json
@@ -0,0 +1,3 @@
+{
+    "Keys": [ "EvdevTouch" ]
+}

diff --git a/src/plugins/generic/evdevtouch/evdevtouch.pro b/src/plugins/generic/evdevtouch/evdevtouch.pro
index 78fe551..284f1d1 100644 (file)
--- a/src/plugins/generic/evdevtouch/evdevtouch.pro
+++ b/src/plugins/generic/evdevtouch/evdevtouch.pro
@@ -12,3 +12,6 @@ SOURCES = main.cpp \
     qevdevtouch.cpp
 
 QT += core-private platformsupport-private
+
+OTHER_FILES += \
+    evdevtouch.json

diff --git a/src/plugins/generic/evdevtouch/main.cpp b/src/plugins/generic/evdevtouch/main.cpp
index 526e336..47b026a 100644 (file)
--- a/src/plugins/generic/evdevtouch/main.cpp
+++ b/src/plugins/generic/evdevtouch/main.cpp
@@ -46,6 +46,9 @@ QT_BEGIN_NAMESPACE
 
 class QTouchScreenPlugin : public QGenericPlugin
 {
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QGenericPluginFactoryInterface" FILE "evdevtouch.json")
+
 public:
     QTouchScreenPlugin();
 
@@ -71,6 +74,6 @@ QObject* QTouchScreenPlugin::create(const QString &key,
     return 0;
 }
 
-Q_EXPORT_PLUGIN2(qevdevtouchplugin, QTouchScreenPlugin)
-
 QT_END_NAMESPACE
+
+#include "main.moc"