Move QPlatformInputContextPlugin/Factory to QtGui
authorWeng Xuetian <wengxt@gmail.com>
Sun, 24 Jun 2012 11:16:21 +0000 (19:16 +0800)
committerQt by Nokia <qt-info@nokia.com>
Thu, 28 Jun 2012 04:22:03 +0000 (06:22 +0200)
commit4dd2de9c7676220d2ac47f679ae05719078da0d0
tree0c1e1831a6a7d2c193396fff540093ea3e9147e7
parentfdcdae21d8ec077d8c24786ed5d4420fe770bcbf
Move QPlatformInputContextPlugin/Factory to QtGui

PlatformSupport is no longer shared and there should be no plugin
factory in it otherwise it will break plugin loading.

Since PlatformInputContext is already in QtGui, so move QPlatformInput-
ContextPlugin/Factory to resolve the platforminputcontexts plugin
loading problem. And remove platformsupport-private dependency from
existing inputcontexts plugin.

Change-Id: If4cb766470b8f9c8b72157da86cb33b4e1ff09e3
Reviewed-by: Pekka Vuorela <pekka.ta.vuorela@nokia.com>
src/gui/kernel/kernel.pri
src/gui/kernel/qplatforminputcontextfactory_p.h [moved from src/platformsupport/inputcontext/qplatforminputcontextfactory_p.h with 97% similarity]
src/gui/kernel/qplatforminputcontextfactory_qpa.cpp [moved from src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa.cpp with 100% similarity]
src/gui/kernel/qplatforminputcontextplugin_p.h [moved from src/platformsupport/inputcontext/qplatforminputcontextplugin_p.h with 97% similarity]
src/gui/kernel/qplatforminputcontextplugin_qpa.cpp [moved from src/platformsupport/inputcontext/qplatforminputcontextplugin_qpa.cpp with 100% similarity]
src/platformsupport/inputcontext/inputcontext.pri [deleted file]
src/platformsupport/platformsupport.pro
src/plugins/platforminputcontexts/ibus/ibus.pro
src/plugins/platforminputcontexts/maliit/maliit.pro