diff options
author | João Abecasis <joao.abecasis@nokia.com> | 2012-02-29 00:57:12 +0100 |
---|---|---|
committer | João Abecasis <joao.abecasis@nokia.com> | 2012-02-29 00:58:13 +0100 |
commit | c4ad58ed2252d5ed9f448a5c068ab33dce4cadd9 (patch) | |
tree | 7e9802171d7b4c641c2de1ef781023cab5d7d14c /src/plugins/platforminputcontexts/maliit/main.cpp | |
parent | 7da3a61b5fd5cc726f8fd62691aa5f84c7929800 (diff) | |
parent | fa1b9070af66edb81b2a3735c1951f78b22bd666 (diff) |
Merge remote-tracking branch 'gerrit/master' into containers
Change-Id: I97ba222435ff50a9e5422e6f2c73e4bb8d1b865c
Diffstat (limited to 'src/plugins/platforminputcontexts/maliit/main.cpp')
-rw-r--r-- | src/plugins/platforminputcontexts/maliit/main.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/plugins/platforminputcontexts/maliit/main.cpp b/src/plugins/platforminputcontexts/maliit/main.cpp index 2b42befc67..2552cc0aa6 100644 --- a/src/plugins/platforminputcontexts/maliit/main.cpp +++ b/src/plugins/platforminputcontexts/maliit/main.cpp @@ -47,6 +47,9 @@ QT_BEGIN_NAMESPACE class QMaliitPlatformInputContextPlugin : public QPlatformInputContextPlugin { + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPlatformInputContextFactoryInterface" FILE "maliit.json") + public: QStringList keys() const; QPlatformInputContext *create(const QString&, const QStringList&); @@ -66,6 +69,6 @@ QPlatformInputContext *QMaliitPlatformInputContextPlugin::create(const QString& return 0; } -Q_EXPORT_PLUGIN2(maliitplatforminputcontextplugin, QMaliitPlatformInputContextPlugin) - QT_END_NAMESPACE + +#include "main.moc" |