whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use new plugin system for Input Context plugins. 

Change-Id: Ifd1f63499afba546a745815762263a58ebf66460
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
bb10
Friedemann Kleint 2012-02-20 14:05:33 +01:00 committed by Qt by Nokia
parent 13f3346d34
commit 4e4fd63371
7 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/platformsupport/inputcontext/qplatforminputcontextplugin_qpa_p.h
View File

@ -68,7 +68,7 @@ class QPlatformInputContext;
virtual QPlatformInputContext *create(const QString &key, const QStringList &paramList) = 0;
};
#define QPlatformInputContextFactoryInterface_iid "com.nokia.Qt.QPlatformInputContextFactoryInterface"
#define QPlatformInputContextFactoryInterface_iid "org.qt-project.Qt.QPlatformInputContextFactoryInterface"
Q_DECLARE_INTERFACE(QPlatformInputContextFactoryInterface, QPlatformInputContextFactoryInterface_iid)

3
src/plugins/platforminputcontexts/ibus/ibus.json Normal file
View File

@ -0,0 +1,3 @@
{
"Keys": [ "ibus" ]
}

2
src/plugins/platforminputcontexts/ibus/ibus.pro
View File

@ -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

7
src/plugins/platforminputcontexts/ibus/main.cpp
View File

@ -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"

7
src/plugins/platforminputcontexts/maliit/main.cpp
View File

@ -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"

3
src/plugins/platforminputcontexts/maliit/maliit.json Normal file
View File

@ -0,0 +1,3 @@
{
"Keys": [ "maliit" ]
}

2
src/plugins/platforminputcontexts/maliit/maliit.pro
View File

@ -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