From deda6132c1f7b2a67d7734fa600d49f8ed0f2bd4 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Wed, 18 Jan 2023 07:29:20 +0000
Subject: [PATCH] qtbase: move xkbcommon and glib to defaults

Both xkbcommon (for keyboard handling) and glib (for eventloop)
are useful also without X11. Move them to default PACKAGECONFIGs.

Change-Id: Ib298a0916d781fd11c0e4ad53dc642734d60ca3b
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit 9ad2cce88e54ad9009b31d721cf314a1ba72dbf4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 recipes-qt/qt6/qtbase_git.bb | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb
index b0fec0e..f712e04 100644
--- a/recipes-qt/qt6/qtbase_git.bb
+++ b/recipes-qt/qt6/qtbase_git.bb
@@ -54,13 +54,27 @@ PACKAGECONFIG_GRAPHICS ?= "\
         bb.utils.contains('DISTRO_FEATURES', 'x11', 'gl', 'gles2 eglfs', d), 'no-opengl linuxfb', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
 "
-PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xkbcommon glib', '', d)}"
+PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb', '', d)}"
 PACKAGECONFIG_KDE ?= "${@bb.utils.contains('DISTRO_FEATURES', 'kde', 'sm cups kms gbm sql-sqlite', '', d)}"
 PACKAGECONFIG_FONTS ?= ""
 PACKAGECONFIG_SYSTEM ?= ""
 PACKAGECONFIG_DISTRO ?= ""
-PACKAGECONFIG_DEFAULT ?= "accessibility dbus udev gui widgets icu openssl  \
-    jpeg png dbus libinput fontconfig harfbuzz zlib \
+PACKAGECONFIG_DEFAULT ?= "\
+    accessibility \
+    dbus \
+    fontconfig \
+    glib \
+    gui \
+    harfbuzz \
+    icu \
+    jpeg \
+    libinput \
+    openssl  \
+    png \
+    udev \
+    widgets \
+    xkbcommon \
+    zlib \
     ${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Os', 'optimize-size ltcg', '', d)} \
     ${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', 'zstd', '', d)} \
 "