Fix handling QT_IM_MODULE=none
authorPekka Vuorela <pekka.vuorela@jollamobile.com>
Thu, 21 Aug 2014 11:52:45 +0000 (14:52 +0300)
committerGatis Paeglis <gatis.paeglis@digia.com>
Sat, 23 Aug 2014 13:27:16 +0000 (15:27 +0200)
commit4a6772a587c8fe86f3f674a1d1164ad6659fbfca
tree436da2131662dc6b0aedaf9fac75235470cba242
parent07c34fcc8a721ffe989eb8882b75ecb95600516c
Fix handling QT_IM_MODULE=none

Was added with 19a39a4 to allow no input context to be created.
Broken by commit 24c10b0. Especially if compose input context didn't
get compiled, the first input context found was loaded.

Also made Xcb integration use compose plugin by default.

Change-Id: I992eaa8b383320e4ab725bb7b79f561f4f841458
Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
src/gui/kernel/qplatforminputcontextfactory.cpp
src/plugins/platforms/xcb/qxcbconnection.cpp