diff options
| author | Jan Arne Petersen <jpetersen@openismus.com> | 2012-02-10 14:52:32 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-10 19:32:41 +0100 |
| commit | 19a39a4ea2f7ef7f9a1e8a54fc13240e79ccf79d (patch) | |
| tree | e47abf2f5c0b3b4bc4a906f4277cca280a5fcff4 | |
| parent | 9633459274f99487360bcc7c7e7c593c4ac98ce2 (diff) | |
Add support for "none" QT_IM_MODULE
Do not try to load any input method when QT_IM_MODULE is set to "none".
Change-Id: I695cb76d616bb2ce5021979bae2790b2f286122d
Reviewed-by: Pekka Vuorela <pekka.ta.vuorela@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| -rw-r--r-- | src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa.cpp b/src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa.cpp index 9e38e4cedf..ca3673f670 100644 --- a/src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa.cpp +++ b/src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa.cpp @@ -83,8 +83,11 @@ QPlatformInputContext *QPlatformInputContextFactory::create() QPlatformInputContext *ic = 0; QString icString = QString::fromLatin1(qgetenv("QT_IM_MODULE")); - ic = create(icString); + if (icString == QStringLiteral("none")) + return 0; + + ic = create(icString); if (ic && ic->isValid()) return ic; |