Start using libxkbcommon in the xcb plug-in.

1 files changed, 18 insertions, 6 deletions

diff --git a/configure b/configure
index 9a666d9e74..625c3ff430 100755
--- a/configure
+++ b/configure
@@ -6291,13 +6291,19 @@ if [ "$PLATFORM_QPA" = "yes" ]; then
         QMAKE_LIBS_WAYLAND=`$PKG_CONFIG --libs wayland-client 2>/dev/null`
         QMAKE_INCDIR_WAYLAND=`$PKG_CONFIG --variable=includedir wayland-client 2>/dev/null`
         QMAKE_LIBDIR_WAYLAND=`$PKG_CONFIG --variable=libdir wayland-client 2>/dev/null`
+    fi
 
-        if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists xkbcommon 2>/dev/null; then
-            QMAKE_CFLAGS_WAYLAND="$QMAKE_CFLAGS_WAYLAND `$PKG_CONFIG --cflags xkbcommon 2>/dev/null`"
-            QMAKE_LIBS_WAYLAND="$QMAKE_LIBS_WAYLAND `$PKG_CONFIG --libs xkbcommon 2>/dev/null`"
-        else
-            QMAKE_DEFINES_WAYLAND=QT_NO_WAYLAND_XKB
-        fi
+    # Detect libxkbcommon
+    if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists xkbcommon 2>/dev/null; then
+        QMAKE_CFLAGS_XKBCOMMON="`$PKG_CONFIG --cflags xkbcommon 2>/dev/null`"
+        QMAKE_LIBS_XKBCOMMON="`$PKG_CONFIG --libs xkbcommon 2>/dev/null`"
+        QMAKE_CFLAGS_WAYLAND="$QMAKE_CFLAGS_WAYLAND $QMAKE_CFLAGS_XKBCOMMON"
+        QMAKE_LIBS_WAYLAND="$QMAKE_LIBS_WAYLAND $QMAKE_LIBS_XKBCOMMON"
+        QMAKE_CFLAGS_XCB="$QMAKE_CFLAGS_XCB $QMAKE_CFLAGS_XKBCOMMON"
+        QMAKE_LIBS_XCB="$QMAKE_LIBS_XCB $QMAKE_LIBS_XKBCOMMON"
+    else
+        QMAKE_DEFINES_WAYLAND=QT_NO_WAYLAND_XKB
+        QMAKE_DEFINES_XCB=QT_NO_XCB_XKB
     fi
 
     # QMake variables set here override those in the mkspec. Therefore we only set the variables here if they are not zero.
@@ -6309,6 +6315,12 @@ if [ "$PLATFORM_QPA" = "yes" ]; then
         QMakeVar set QMAKE_DEFINES_WAYLAND " $QMAKE_DEFINES_WAYLAND"
     fi
 
+    if [ -n "$QMAKE_CFLAGS_XCB" ] || [ -n "$QMAKE_LIBS_XCB" ]; then
+        QMakeVar set QMAKE_CFLAGS_XCB "$QMAKE_CFLAGS_XCB"
+        QMakeVar set QMAKE_LIBS_XCB "$QMAKE_LIBS_XCB"
+        QMakeVar set QMAKE_DEFINES_XCB "$QMAKE_DEFINES_XCB"
+    fi
+
     if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qpa/wayland "Wayland" $L_FLAGS $I_FLAGS $l_FLAGS $QMAKE_CFLAGS_WAYLAND $QMAKE_LIBS_WAYLAND; then
         QT_CONFIG="$QT_CONFIG wayland"
     fi