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/evdevtouch | |
| 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/evdevtouch')
| -rw-r--r-- | src/plugins/generic/evdevtouch/evdevtouch.json | 3 | ||||
| -rw-r--r-- | src/plugins/generic/evdevtouch/evdevtouch.pro | 3 | ||||
| -rw-r--r-- | src/plugins/generic/evdevtouch/main.cpp | 7 |
3 files changed, 11 insertions, 2 deletions
diff --git a/src/plugins/generic/evdevtouch/evdevtouch.json b/src/plugins/generic/evdevtouch/evdevtouch.json new file mode 100644 index 0000000000..6a6959c8e6 --- /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 78fe551aa2..284f1d1221 100644 --- 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 526e336fd8..47b026ac96 100644 --- 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" |