From 864466d2e5ae9ab7a2e01a7da3abc5a4c0b16bda Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Fri, 3 Jul 2020 08:32:08 +0200
Subject: Move xkbcommon to QtGui
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/plugins/platforminputcontexts/ibus/CMakeLists.txt                | 1 -
 src/plugins/platforminputcontexts/ibus/ibus.pro                      | 2 +-
 src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp | 2 +-
 src/plugins/platforms/xcb/.prev_CMakeLists.txt                       | 1 -
 src/plugins/platforms/xcb/CMakeLists.txt                             | 1 -
 src/plugins/platforms/xcb/qxcbkeyboard.h                             | 2 +-
 src/plugins/platforms/xcb/xcb_qpa_lib.pro                            | 3 +--
 7 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'src/plugins')

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
 
-- 
cgit v1.2.3