diff options
Diffstat (limited to 'src/plugins/platforminputcontexts/maliit')
4 files changed, 11 insertions, 3 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" diff --git a/src/plugins/platforminputcontexts/maliit/maliit.json b/src/plugins/platforminputcontexts/maliit/maliit.json new file mode 100644 index 0000000000..f828e1426e --- /dev/null +++ b/src/plugins/platforminputcontexts/maliit/maliit.json @@ -0,0 +1,3 @@ +{ + "Keys": [ "maliit" ] +} diff --git a/src/plugins/platforminputcontexts/maliit/maliit.pro b/src/plugins/platforminputcontexts/maliit/maliit.pro index a20e766580..445e172637 100644 --- a/src/plugins/platforminputcontexts/maliit/maliit.pro +++ b/src/plugins/platforminputcontexts/maliit/maliit.pro @@ -15,5 +15,7 @@ HEADERS += $$PWD/qmaliitplatforminputcontext.h \ $$PWD/serveraddressproxy.h \ $$PWD/contextadaptor.h +OTHER_FILES += $$PWD/maliit.json + target.path += $$[QT_INSTALL_PLUGINS]/platforminputcontexts INSTALLS += target diff --git a/src/plugins/platforminputcontexts/maliit/qmaliitplatforminputcontext.h b/src/plugins/platforminputcontexts/maliit/qmaliitplatforminputcontext.h index 3760885641..a17abe7cbb 100644 --- a/src/plugins/platforminputcontexts/maliit/qmaliitplatforminputcontext.h +++ b/src/plugins/platforminputcontexts/maliit/qmaliitplatforminputcontext.h @@ -59,7 +59,7 @@ public: bool isValid() const; - void invokeAction(QInputPanel::Action action, int x); + void invokeAction(QInputMethod::Action action, int x); void reset(void); void update(Qt::InputMethodQueries); virtual QRectF keyboardRect() const; |