diff options
| author | Weng Xuetian <wengxt@gmail.com> | 2012-06-24 19:16:21 +0800 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-28 06:22:03 +0200 |
| commit | 4dd2de9c7676220d2ac47f679ae05719078da0d0 (patch) | |
| tree | 0c1e1831a6a7d2c193396fff540093ea3e9147e7 /src/gui/kernel/kernel.pri | |
| parent | fdcdae21d8ec077d8c24786ed5d4420fe770bcbf (diff) | |
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>
Diffstat (limited to 'src/gui/kernel/kernel.pri')
| -rw-r--r-- | src/gui/kernel/kernel.pri | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri index 9ea2d76aea..9825633358 100644 --- a/src/gui/kernel/kernel.pri +++ b/src/gui/kernel/kernel.pri @@ -16,6 +16,8 @@ HEADERS += \ kernel/qplatformscreen_p.h \ kernel/qplatforminputcontext.h \ kernel/qplatforminputcontext_p.h \ + kernel/qplatforminputcontextfactory_p.h \ + kernel/qplatforminputcontextplugin_p.h \ kernel/qplatformintegrationfactory_p.h \ kernel/qplatformintegrationplugin.h \ kernel/qplatformtheme.h\ @@ -67,6 +69,8 @@ SOURCES += \ kernel/qgenericpluginfactory_qpa.cpp \ kernel/qgenericplugin_qpa.cpp \ kernel/qwindowsysteminterface_qpa.cpp \ + kernel/qplatforminputcontextfactory_qpa.cpp \ + kernel/qplatforminputcontextplugin_qpa.cpp \ kernel/qplatforminputcontext_qpa.cpp \ kernel/qplatformintegration_qpa.cpp \ kernel/qplatformdrag_qpa.cpp \ |