AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move QPlatformInputContextPlugin/Factory to QtGui

Browse Source 
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>
This commit is contained in:
Weng Xuetian 2012-06-24 19:16:21 +08:00 committed by Qt by Nokia
parent fdcdae21d8
commit 4dd2de9c76
9 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/kernel/kernel.pri
View File

@ -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 \

2
src/platformsupport/inputcontext/qplatforminputcontextfactory_p.h → src/gui/kernel/qplatforminputcontextfactory_p.h
View File

@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE
class QPlatformInputContext;
class QPlatformInputContextFactory
class Q_GUI_EXPORT QPlatformInputContextFactory
{
public:
static QStringList keys();

0
src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa.cpp → src/gui/kernel/qplatforminputcontextfactory_qpa.cpp
View File

2
src/platformsupport/inputcontext/qplatforminputcontextplugin_p.h → src/gui/kernel/qplatforminputcontextplugin_p.h
View File

@ -65,7 +65,7 @@ class QPlatformInputContext;
#define QPlatformInputContextFactoryInterface_iid "org.qt-project.Qt.QPlatformInputContextFactoryInterface"
class Q_PLATFORMSUPPORT_EXPORT QPlatformInputContextPlugin : public QObject
class Q_GUI_EXPORT QPlatformInputContextPlugin : public QObject
{
Q_OBJECT
public:

0
src/platformsupport/inputcontext/qplatforminputcontextplugin_qpa.cpp → src/gui/kernel/qplatforminputcontextplugin_qpa.cpp
View File

6
src/platformsupport/inputcontext/inputcontext.pri
View File

@ -1,6 +0,0 @@
HEADERS += \
$$PWD/qplatforminputcontextplugin_p.h \
$$PWD/qplatforminputcontextfactory_p.h
SOURCES += \
$$PWD/qplatforminputcontextplugin_qpa.cpp \
$$PWD/qplatforminputcontextfactory_qpa.cpp

1
src/platformsupport/platformsupport.pro
View File

@ -18,7 +18,6 @@ include(fb_base/fb_base.pri)
include(fontdatabases/fontdatabases.pri)
include(glxconvenience/glxconvenience.pri)
include(input/input.pri)
include(inputcontext/inputcontext.pri)
include(devicediscovery/devicediscovery.pri)
include(services/services.pri)
include(themes/themes.pri)

2
src/plugins/platforminputcontexts/ibus/ibus.pro
View File

@ -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 \

2
src/plugins/platforminputcontexts/maliit/maliit.pro
View File

@ -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 \