diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-03 08:32:08 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-04 20:46:07 +0200 |
| commit | 864466d2e5ae9ab7a2e01a7da3abc5a4c0b16bda (patch) | |
| tree | f1c09a2320f2455d3f2c81a9e91031f4a8b9d849 /src/plugins | |
| parent | 90f1ef14aaf2f4b4dc49755ab8605e6a37ee06c6 (diff) | |
Move xkbcommon to QtGui
Task-number: QTBUG-83255
Change-Id: Ia1c6a49af6be4aaa6b988537c38db3a2c0a646a5
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/plugins')
7 files changed, 4 insertions, 8 deletions
diff --git a/src/plugins/platforminputcontexts/ibus/CMakeLists.txt b/src/plugins/platforminputcontexts/ibus/CMakeLists.txt index ed75d7062a..a2f2275795 100644 --- a/src/plugins/platforminputcontexts/ibus/CMakeLists.txt +++ b/src/plugins/platforminputcontexts/ibus/CMakeLists.txt @@ -19,7 +19,6 @@ qt_internal_add_plugin(QIbusPlatformInputContextPlugin Qt::DBus Qt::Gui Qt::GuiPrivate - Qt::XkbCommonSupportPrivate ) #### Keys ignored in scope 1:.:.:ibus.pro:<TRUE>: diff --git a/src/plugins/platforminputcontexts/ibus/ibus.pro b/src/plugins/platforminputcontexts/ibus/ibus.pro index 9ba2297e38..52836bb8b6 100644 --- a/src/plugins/platforminputcontexts/ibus/ibus.pro +++ b/src/plugins/platforminputcontexts/ibus/ibus.pro @@ -1,6 +1,6 @@ TARGET = ibusplatforminputcontextplugin -QT += dbus gui-private xkbcommon_support-private +QT += dbus gui-private SOURCES += $$PWD/qibusplatforminputcontext.cpp \ $$PWD/qibusproxy.cpp \ $$PWD/qibusproxyportal.cpp \ diff --git a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp index 16c0ebfe21..c50f03de05 100644 --- a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp +++ b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp @@ -51,7 +51,7 @@ #include <QtGui/private/qguiapplication_p.h> -#include <QtXkbCommonSupport/private/qxkbcommon_p.h> +#include <QtGui/private/qxkbcommon_p.h> #include "qibusproxy.h" #include "qibusproxyportal.h" diff --git a/src/plugins/platforms/xcb/.prev_CMakeLists.txt b/src/plugins/platforms/xcb/.prev_CMakeLists.txt index db0d1adb16..7f0a0b01d0 100644 --- a/src/plugins/platforms/xcb/.prev_CMakeLists.txt +++ b/src/plugins/platforms/xcb/.prev_CMakeLists.txt @@ -42,7 +42,6 @@ qt_add_module(XcbQpa PkgConfig::XKB_COMMON_X11 Qt::CorePrivate Qt::GuiPrivate - Qt::XkbCommonSupportPrivate XCB::ICCCM XCB::IMAGE XCB::KEYSYMS diff --git a/src/plugins/platforms/xcb/CMakeLists.txt b/src/plugins/platforms/xcb/CMakeLists.txt index 5193823904..a7c2d5610a 100644 --- a/src/plugins/platforms/xcb/CMakeLists.txt +++ b/src/plugins/platforms/xcb/CMakeLists.txt @@ -42,7 +42,6 @@ qt_add_module(XcbQpa PkgConfig::XKB_COMMON_X11 Qt::CorePrivate Qt::GuiPrivate - Qt::XkbCommonSupportPrivate XCB::ICCCM XCB::IMAGE XCB::KEYSYMS diff --git a/src/plugins/platforms/xcb/qxcbkeyboard.h b/src/plugins/platforms/xcb/qxcbkeyboard.h index 0ee08aeff2..cf89acff6d 100644 --- a/src/plugins/platforms/xcb/qxcbkeyboard.h +++ b/src/plugins/platforms/xcb/qxcbkeyboard.h @@ -47,7 +47,7 @@ #include <xcb/xkb.h> #undef explicit -#include <QtXkbCommonSupport/private/qxkbcommon_p.h> +#include <QtGui/private/qxkbcommon_p.h> #include <xkbcommon/xkbcommon-x11.h> #include <QEvent> diff --git a/src/plugins/platforms/xcb/xcb_qpa_lib.pro b/src/plugins/platforms/xcb/xcb_qpa_lib.pro index 1b42a60e0c..809ae2b212 100644 --- a/src/plugins/platforms/xcb/xcb_qpa_lib.pro +++ b/src/plugins/platforms/xcb/xcb_qpa_lib.pro @@ -3,8 +3,7 @@ CONFIG += no_module_headers internal_module DEFINES += QT_NO_FOREACH QT += \ - core-private gui-private \ - xkbcommon_support-private + core-private gui-private qtConfig(opengl): QT += opengl-private |