diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:18:59 +1000 |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:23:14 +1000 |
| commit | 98dd1781d9256f68025d2a2db408f4f5947f3214 (patch) | |
| tree | dbe1424abd90014edb5546c920ca585ed62b46e3 /src/plugins/generic/evdevmouse | |
| parent | 6c1bdc1854a7700c2b3a345b95f6a2fdca84037d (diff) | |
| parent | fa1b9070af66edb81b2a3735c1951f78b22bd666 (diff) | |
Merge master -> api_changes
Includes fixes for tst_qfiledialog2, tst_qtextedit autotests on mac.
Change-Id: I49cac26894d31291a8339ccc1eb80b6a940f0827
Diffstat (limited to 'src/plugins/generic/evdevmouse')
| -rw-r--r-- | src/plugins/generic/evdevmouse/evdevmouse.json | 3 | ||||
| -rw-r--r-- | src/plugins/generic/evdevmouse/evdevmouse.pro | 3 | ||||
| -rw-r--r-- | src/plugins/generic/evdevmouse/main.cpp | 7 |
3 files changed, 11 insertions, 2 deletions
diff --git a/src/plugins/generic/evdevmouse/evdevmouse.json b/src/plugins/generic/evdevmouse/evdevmouse.json new file mode 100644 index 0000000000..00ddd3a9cf --- /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 f25199161b..c5d162fb2f 100644 --- 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 34ca62f960..47a4ddf56b 100644 --- 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" |