diff options
7 files changed, 21 insertions, 5 deletions
diff --git a/src/platformsupport/inputcontext/qplatforminputcontextplugin_qpa_p.h b/src/platformsupport/inputcontext/qplatforminputcontextplugin_qpa_p.h index 495567db07..e9e419546b 100644 --- a/src/platformsupport/inputcontext/qplatforminputcontextplugin_qpa_p.h +++ b/src/platformsupport/inputcontext/qplatforminputcontextplugin_qpa_p.h @@ -68,7 +68,7 @@ class QPlatformInputContext; virtual QPlatformInputContext *create(const QString &key, const QStringList ¶mList) = 0; }; -#define QPlatformInputContextFactoryInterface_iid "com.nokia.Qt.QPlatformInputContextFactoryInterface" +#define QPlatformInputContextFactoryInterface_iid "org.qt-project.Qt.QPlatformInputContextFactoryInterface" Q_DECLARE_INTERFACE(QPlatformInputContextFactoryInterface, QPlatformInputContextFactoryInterface_iid) diff --git a/src/plugins/platforminputcontexts/ibus/ibus.json b/src/plugins/platforminputcontexts/ibus/ibus.json new file mode 100644 index 0000000000..b921cb49c7 --- /dev/null +++ b/src/plugins/platforminputcontexts/ibus/ibus.json @@ -0,0 +1,3 @@ +{ + "Keys": [ "ibus" ] +} diff --git a/src/plugins/platforminputcontexts/ibus/ibus.pro b/src/plugins/platforminputcontexts/ibus/ibus.pro index 193dad0018..12419343fa 100644 --- a/src/plugins/platforminputcontexts/ibus/ibus.pro +++ b/src/plugins/platforminputcontexts/ibus/ibus.pro @@ -15,5 +15,7 @@ HEADERS += $$PWD/qibusplatforminputcontext.h \ $$PWD/qibusinputcontextproxy.h \ $$PWD/qibustypes.h +OTHER_FILES += $$PWD/ibus.json + target.path += $$[QT_INSTALL_PLUGINS]/platforminputcontexts INSTALLS += target diff --git a/src/plugins/platforminputcontexts/ibus/main.cpp b/src/plugins/platforminputcontexts/ibus/main.cpp index 0810b30ca6..19f032b7df 100644 --- a/src/plugins/platforminputcontexts/ibus/main.cpp +++ b/src/plugins/platforminputcontexts/ibus/main.cpp @@ -47,6 +47,9 @@ QT_BEGIN_NAMESPACE class QIbusPlatformInputContextPlugin : public QPlatformInputContextPlugin { + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPlatformInputContextFactoryInterface" FILE "ibus.json") + public: QStringList keys() const; QIBusPlatformInputContext *create(const QString&, const QStringList&); @@ -66,6 +69,6 @@ QIBusPlatformInputContext *QIbusPlatformInputContextPlugin::create(const QString return 0; } -Q_EXPORT_PLUGIN2(ibusplatforminputcontextplugin, QIbusPlatformInputContextPlugin) - QT_END_NAMESPACE + +#include "main.moc" 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 |