diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2015-09-20 10:44:23 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2015-09-21 16:39:15 +0000 |
| commit | c0a3515d8daeda18e93a282a38a11583e27d32be (patch) | |
| tree | d6167803e294f91f6e90130991f444c951fa643f /src | |
| parent | 05d401104ee6b10699b7288ead044d6765b19c4d (diff) | |
Pretend the X11 "compose" platform input context plugin to be "xim" too
This is for compatibility with old Qt versions that had this.
Task-number: QTBUG-48360
Change-Id: I42e7ef1a481840699a8dffff1405c0a348e32e27
Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforminputcontexts/compose/compose.json | 2 | ||||
| -rw-r--r-- | src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontextmain.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/platforminputcontexts/compose/compose.json b/src/plugins/platforminputcontexts/compose/compose.json index 2daf89ed30..fb95f1bfb0 100644 --- a/src/plugins/platforminputcontexts/compose/compose.json +++ b/src/plugins/platforminputcontexts/compose/compose.json @@ -1,3 +1,3 @@ { - "Keys": [ "compose" ] + "Keys": [ "compose", "xim" ] } diff --git a/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontextmain.cpp b/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontextmain.cpp index 96f6424ba2..15c98ed006 100644 --- a/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontextmain.cpp +++ b/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontextmain.cpp @@ -52,7 +52,8 @@ QComposeInputContext *QComposePlatformInputContextPlugin::create(const QString & { Q_UNUSED(paramList); - if (system.compare(system, QLatin1String("compose"), Qt::CaseInsensitive) == 0) + if (system.compare(system, QLatin1String("compose"), Qt::CaseInsensitive) == 0 + || system.compare(system, QLatin1String("xim"), Qt::CaseInsensitive) == 0) return new QComposeInputContext; return 0; } |