diff options
author | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2012-02-22 09:25:01 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-22 09:46:08 +0100 |
commit | 349e04eb7c173ad6e01b866d4c0d517f89e2a201 (patch) | |
tree | f13675ec4ecb2c6d16f3074030bf89029fca5015 /src/plugins/generic/evdevkeyboard | |
parent | 949b7452e0d2402a3ba046a5ba1fe043b670baaa (diff) |
Migrate evdev plugins to the new plugin system
Change-Id: I7eb283646b7529080c8c2f41c267b0135c8f57e4
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/plugins/generic/evdevkeyboard')
-rw-r--r-- | src/plugins/generic/evdevkeyboard/evdevkeyboard.json | 3 | ||||
-rw-r--r-- | src/plugins/generic/evdevkeyboard/evdevkeyboard.pro | 3 | ||||
-rw-r--r-- | src/plugins/generic/evdevkeyboard/main.cpp | 7 |
3 files changed, 11 insertions, 2 deletions
diff --git a/src/plugins/generic/evdevkeyboard/evdevkeyboard.json b/src/plugins/generic/evdevkeyboard/evdevkeyboard.json new file mode 100644 index 0000000000..0e24bb0568 --- /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 997a58ef6e..47608b7154 100644 --- 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 6df4e29fcb..71d15720bd 100644 --- 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" |