From 4dd2de9c7676220d2ac47f679ae05719078da0d0 Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Sun, 24 Jun 2012 19:16:21 +0800 Subject: [PATCH] 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 --- src/gui/kernel/kernel.pri | 4 ++++ .../inputcontext => gui/kernel}/qplatforminputcontextfactory_p.h | 2 +- .../kernel}/qplatforminputcontextfactory_qpa.cpp | 0 .../inputcontext => gui/kernel}/qplatforminputcontextplugin_p.h | 2 +- .../inputcontext => gui/kernel}/qplatforminputcontextplugin_qpa.cpp | 0 src/platformsupport/inputcontext/inputcontext.pri | 6 ------ src/platformsupport/platformsupport.pro | 1 - src/plugins/platforminputcontexts/ibus/ibus.pro | 2 +- src/plugins/platforminputcontexts/maliit/maliit.pro | 2 +- 9 files changed, 8 insertions(+), 11 deletions(-) rename src/{platformsupport/inputcontext => gui/kernel}/qplatforminputcontextfactory_p.h (97%) rename src/{platformsupport/inputcontext => gui/kernel}/qplatforminputcontextfactory_qpa.cpp (100%) rename src/{platformsupport/inputcontext => gui/kernel}/qplatforminputcontextplugin_p.h (97%) rename src/{platformsupport/inputcontext => gui/kernel}/qplatforminputcontextplugin_qpa.cpp (100%) delete mode 100644 src/platformsupport/inputcontext/inputcontext.pri diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri index 9ea2d76..9825633 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 \ diff --git a/src/platformsupport/inputcontext/qplatforminputcontextfactory_p.h b/src/gui/kernel/qplatforminputcontextfactory_p.h similarity index 97% rename from src/platformsupport/inputcontext/qplatforminputcontextfactory_p.h rename to src/gui/kernel/qplatforminputcontextfactory_p.h index a7ed2eb..f768100 100644 --- a/src/platformsupport/inputcontext/qplatforminputcontextfactory_p.h +++ b/src/gui/kernel/qplatforminputcontextfactory_p.h @@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE class QPlatformInputContext; -class QPlatformInputContextFactory +class Q_GUI_EXPORT QPlatformInputContextFactory { public: static QStringList keys(); diff --git a/src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa.cpp b/src/gui/kernel/qplatforminputcontextfactory_qpa.cpp similarity index 100% rename from src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa.cpp rename to src/gui/kernel/qplatforminputcontextfactory_qpa.cpp diff --git a/src/platformsupport/inputcontext/qplatforminputcontextplugin_p.h b/src/gui/kernel/qplatforminputcontextplugin_p.h similarity index 97% rename from src/platformsupport/inputcontext/qplatforminputcontextplugin_p.h rename to src/gui/kernel/qplatforminputcontextplugin_p.h index e7b173e..49bca9d 100644 --- a/src/platformsupport/inputcontext/qplatforminputcontextplugin_p.h +++ b/src/gui/kernel/qplatforminputcontextplugin_p.h @@ -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: diff --git a/src/platformsupport/inputcontext/qplatforminputcontextplugin_qpa.cpp b/src/gui/kernel/qplatforminputcontextplugin_qpa.cpp similarity index 100% rename from src/platformsupport/inputcontext/qplatforminputcontextplugin_qpa.cpp rename to src/gui/kernel/qplatforminputcontextplugin_qpa.cpp diff --git a/src/platformsupport/inputcontext/inputcontext.pri b/src/platformsupport/inputcontext/inputcontext.pri deleted file mode 100644 index 8debcd0..0000000 --- a/src/platformsupport/inputcontext/inputcontext.pri +++ /dev/null @@ -1,6 +0,0 @@ -HEADERS += \ - $$PWD/qplatforminputcontextplugin_p.h \ - $$PWD/qplatforminputcontextfactory_p.h -SOURCES += \ - $$PWD/qplatforminputcontextplugin_qpa.cpp \ - $$PWD/qplatforminputcontextfactory_qpa.cpp diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index e8ea981..617cf90 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -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) diff --git a/src/plugins/platforminputcontexts/ibus/ibus.pro b/src/plugins/platforminputcontexts/ibus/ibus.pro index 0fb92f2..8c8ab52 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 dbcd22e..4174072 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 \ -- 2.7.4