From 19a39a4ea2f7ef7f9a1e8a54fc13240e79ccf79d Mon Sep 17 00:00:00 2001 From: Jan Arne Petersen Date: Fri, 10 Feb 2012 14:52:32 +0100 Subject: 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 Reviewed-by: Lars Knoll --- .../inputcontext/qplatforminputcontextfactory_qpa.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/platformsupport') 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; -- cgit v1.2.3