Make xkb a private dependency of QtGui

It should not be necessary to have the xkb dev package installed for
users of QtGui.

Task-number: QTBUG-86421
Change-Id: I4a4102d578df504d23f504a97704fcab4a39023b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

8 files changed, 17 insertions, 3 deletions

diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt
index 5b4c581bed..f0c3dd1662 100644
--- a/src/gui/.prev_CMakeLists.txt
+++ b/src/gui/.prev_CMakeLists.txt
@@ -828,7 +828,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_xkbcommon AND UNIX
     SOURCES
         platform/unix/qxkbcommon.cpp platform/unix/qxkbcommon_p.h
         platform/unix/qxkbcommon_3rdparty.cpp
-    PUBLIC_LIBRARIES
+    LIBRARIES
         XKB::XKB
 )
 
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index dc7d28d0f1..6d496e2d7f 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -999,7 +999,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_xkbcommon AND UNIX
     SOURCES
         platform/unix/qxkbcommon.cpp platform/unix/qxkbcommon_p.h
         platform/unix/qxkbcommon_3rdparty.cpp
-    PUBLIC_LIBRARIES
+    LIBRARIES
         XKB::XKB
 )
 
diff --git a/src/gui/platform/unix/unix.pri b/src/gui/platform/unix/unix.pri
index a51e27f1ee..a322e2ae1a 100644
--- a/src/gui/platform/unix/unix.pri
+++ b/src/gui/platform/unix/unix.pri
@@ -41,5 +41,5 @@ qtConfig(xkbcommon) {
         platform/unix/qxkbcommon.cpp
     HEADERS += \
         platform/unix/qxkbcommon_p.h
-    QMAKE_USE += xkbcommon
+    QMAKE_USE_PRIVATE += xkbcommon
 }
diff --git a/src/platformsupport/input/.prev_CMakeLists.txt b/src/platformsupport/input/.prev_CMakeLists.txt
index 63f88bbb63..b2e9579032 100644
--- a/src/platformsupport/input/.prev_CMakeLists.txt
+++ b/src/platformsupport/input/.prev_CMakeLists.txt
@@ -77,6 +77,11 @@ qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput
         PkgConfig::Libudev
 )
 
+qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput AND QT_FEATURE_xkbcommon
+    LIBRARIES
+        XKB::XKB
+)
+
 qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev OR QT_FEATURE_libinput
     SOURCES
         shared/devicehandlerlist_p.h
diff --git a/src/platformsupport/input/CMakeLists.txt b/src/platformsupport/input/CMakeLists.txt
index 2c2a9fa1cc..5b0c310418 100644
--- a/src/platformsupport/input/CMakeLists.txt
+++ b/src/platformsupport/input/CMakeLists.txt
@@ -82,6 +82,11 @@ qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput
         PkgConfig::Libudev
 )
 
+qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput AND QT_FEATURE_xkbcommon
+    LIBRARIES
+        XKB::XKB
+)
+
 qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev OR QT_FEATURE_libinput
     SOURCES
         shared/devicehandlerlist_p.h
diff --git a/src/platformsupport/input/libinput/libinput.pri b/src/platformsupport/input/libinput/libinput.pri
index 74164a3c9b..8b13da1933 100644
--- a/src/platformsupport/input/libinput/libinput.pri
+++ b/src/platformsupport/input/libinput/libinput.pri
@@ -11,5 +11,6 @@ SOURCES += \
     $$PWD/qlibinputtouch.cpp
 
 QMAKE_USE_PRIVATE += libudev libinput
+qtConfig(xkbcommon): QMAKE_USE_PRIVATE += xkbcommon
 
 INCLUDEPATH += $$PWD/../shared
diff --git a/src/plugins/platforminputcontexts/ibus/CMakeLists.txt b/src/plugins/platforminputcontexts/ibus/CMakeLists.txt
index a2f2275795..686f028c6a 100644
--- a/src/plugins/platforminputcontexts/ibus/CMakeLists.txt
+++ b/src/plugins/platforminputcontexts/ibus/CMakeLists.txt
@@ -14,6 +14,8 @@ qt_internal_add_plugin(QIbusPlatformInputContextPlugin
         qibusproxy.cpp qibusproxy.h
         qibusproxyportal.cpp qibusproxyportal.h
         qibustypes.cpp qibustypes.h
+    LIBRARIES
+        XKB::XKB
     PUBLIC_LIBRARIES
         Qt::Core
         Qt::DBus
diff --git a/src/plugins/platforminputcontexts/ibus/ibus.pro b/src/plugins/platforminputcontexts/ibus/ibus.pro
index 52836bb8b6..a3220fd547 100644
--- a/src/plugins/platforminputcontexts/ibus/ibus.pro
+++ b/src/plugins/platforminputcontexts/ibus/ibus.pro
@@ -1,6 +1,7 @@
 TARGET = ibusplatforminputcontextplugin
 
 QT += dbus gui-private
+QMAKE_USE_PRIVATE += xkbcommon
 SOURCES += $$PWD/qibusplatforminputcontext.cpp \
            $$PWD/qibusproxy.cpp \
            $$PWD/qibusproxyportal.cpp \