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/plugins | |
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/plugins')
-rw-r--r-- | src/plugins/platforminputcontexts/ibus/ibus.pro | 2 | ||||
-rw-r--r-- | src/plugins/platforminputcontexts/maliit/maliit.pro | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforminputcontexts/ibus/ibus.pro b/src/plugins/platforminputcontexts/ibus/ibus.pro index 0fb92f23a8..8c8ab52c3c 100644 --- a/src/plugins/platforminputcontexts/ibus/ibus.pro +++ b/src/plugins/platforminputcontexts/ibus/ibus.pro @@ -3,7 +3,7 @@ load(qt_plugin) QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforminputcontexts -QT += dbus platformsupport-private gui-private +QT += dbus gui-private SOURCES += $$PWD/qibusplatforminputcontext.cpp \ $$PWD/qibusproxy.cpp \ $$PWD/qibusinputcontextproxy.cpp \ diff --git a/src/plugins/platforminputcontexts/maliit/maliit.pro b/src/plugins/platforminputcontexts/maliit/maliit.pro index dbcd22efcb..4174072c2b 100644 --- a/src/plugins/platforminputcontexts/maliit/maliit.pro +++ b/src/plugins/platforminputcontexts/maliit/maliit.pro @@ -3,7 +3,7 @@ load(qt_plugin) QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforminputcontexts -QT += dbus platformsupport-private gui-private +QT += dbus gui-private SOURCES += $$PWD/qmaliitplatforminputcontext.cpp \ $$PWD/serverproxy.cpp \ $$PWD/serveraddressproxy.cpp \ |