diff options
-rw-r--r-- | src/gui/kernel/kernel.pri | 4 | ||||
-rw-r--r-- | src/gui/kernel/qplatforminputcontextfactory_p.h (renamed from src/platformsupport/inputcontext/qplatforminputcontextfactory_p.h) | 2 | ||||
-rw-r--r-- | src/gui/kernel/qplatforminputcontextfactory_qpa.cpp (renamed from src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatforminputcontextplugin_p.h (renamed from src/platformsupport/inputcontext/qplatforminputcontextplugin_p.h) | 2 | ||||
-rw-r--r-- | src/gui/kernel/qplatforminputcontextplugin_qpa.cpp (renamed from src/platformsupport/inputcontext/qplatforminputcontextplugin_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/platformsupport/inputcontext/inputcontext.pri | 6 | ||||
-rw-r--r-- | src/platformsupport/platformsupport.pro | 1 | ||||
-rw-r--r-- | src/plugins/platforminputcontexts/ibus/ibus.pro | 2 | ||||
-rw-r--r-- | src/plugins/platforminputcontexts/maliit/maliit.pro | 2 |
9 files changed, 8 insertions, 11 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 \ diff --git a/src/platformsupport/inputcontext/qplatforminputcontextfactory_p.h b/src/gui/kernel/qplatforminputcontextfactory_p.h index a7ed2ebfb3..f768100c26 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 index 595c3cc1f0..595c3cc1f0 100644 --- a/src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa.cpp +++ b/src/gui/kernel/qplatforminputcontextfactory_qpa.cpp diff --git a/src/platformsupport/inputcontext/qplatforminputcontextplugin_p.h b/src/gui/kernel/qplatforminputcontextplugin_p.h index e7b173ee94..49bca9d607 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 index 670bfd0de5..670bfd0de5 100644 --- a/src/platformsupport/inputcontext/qplatforminputcontextplugin_qpa.cpp +++ b/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 8debcd0129..0000000000 --- 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 e8ea981d6d..617cf902d7 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 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 \ |