1 files changed, 27 insertions, 7 deletions
diff --git a/src/3rdparty/xkbcommon.pri b/src/3rdparty/xkbcommon.pri
index 57470c0499..eb34403746 100644
--- a/src/3rdparty/xkbcommon.pri
+++ b/src/3rdparty/xkbcommon.pri
@@ -1,15 +1,20 @@
 QMAKE_CFLAGS += -std=gnu99 -w
-INCLUDEPATH += $$PWD/xkbcommon $$PWD/xkbcommon/src $$PWD/xkbcommon/src/xkbcomp
+INCLUDEPATH += $$PWD/xkbcommon \
+               $$PWD/xkbcommon/xkbcommon \
+               $$PWD/xkbcommon/src \
+               $$PWD/xkbcommon/src/xkbcomp
 
 DEFINES += DFLT_XKB_CONFIG_ROOT='\\"$$QMAKE_XKB_CONFIG_ROOT\\"'
 
-### RMLVO names can be overwritten with environmental variables (See libxkbcommon documentation)
+### RMLVO names can be overwritten with environmental variables (see libxkbcommon documentation)
 DEFINES += DEFAULT_XKB_RULES='\\"evdev\\"'
 DEFINES += DEFAULT_XKB_MODEL='\\"pc105\\"'
 DEFINES += DEFAULT_XKB_LAYOUT='\\"us\\"'
+# Need to rename several files, qmake has problems processing a project when
+# sub-directories contain files with an equal names.
 
-# Need to rename 2 files, qmake has problems processing a project when
-# directories contain files with equal names.
+# libxkbcommon generates some of these files while executing "./autogen.sh"
+# and some while executing "make" (actually YACC)
 SOURCES += \
     $$PWD/xkbcommon/src/atom.c \
     $$PWD/xkbcommon/src/xkb-compat.c \ # renamed: compat.c -> xkb-compat.c
@@ -18,7 +23,10 @@ SOURCES += \
     $$PWD/xkbcommon/src/keysym.c \
     $$PWD/xkbcommon/src/keysym-utf.c \
     $$PWD/xkbcommon/src/state.c \
-    $$PWD/xkbcommon/src/text.c
+    $$PWD/xkbcommon/src/text.c \
+    $$PWD/xkbcommon/src/context-priv.c \
+    $$PWD/xkbcommon/src/keymap-priv.c \
+    $$PWD/xkbcommon/src/utils.c
 
 SOURCES += \
     $$PWD/xkbcommon/src/xkbcomp/action.c \
@@ -29,12 +37,24 @@ SOURCES += \
     $$PWD/xkbcommon/src/xkbcomp/keycodes.c \
     $$PWD/xkbcommon/src/xkbcomp/keymap-dump.c \
     $$PWD/xkbcommon/src/xkbcomp/keymap.c \
-    $$PWD/xkbcommon/src/xkbcomp/parser.c \
+    $$PWD/xkbcommon/src/xkbcomp/keywords.c \
     $$PWD/xkbcommon/src/xkbcomp/rules.c \
     $$PWD/xkbcommon/src/xkbcomp/scanner.c \
     $$PWD/xkbcommon/src/xkbcomp/symbols.c \
     $$PWD/xkbcommon/src/xkbcomp/types.c \
     $$PWD/xkbcommon/src/xkbcomp/vmod.c \
-    $$PWD/xkbcommon/src/xkbcomp/xkbcomp.c
+    $$PWD/xkbcommon/src/xkbcomp/xkbcomp.c \
+    $$PWD/xkbcommon/src/xkbcomp/parser.c
+
+!contains(DEFINES, QT_NO_XKB):contains(QT_CONFIG, use-xkbcommon-x11support): {
+    # Build xkbcommon-x11 support library, it depends on -lxcb and -lxcb-xkb, linking is done
+    # in xcb-plugin.pro (linked to system libraries or if Qt was configured with -qt-xcb then
+    # linked to -lxcb-static).
+    INCLUDEPATH += $$PWD/xkbcommon/src/x11
+    SOURCES += \
+        $$PWD/xkbcommon/src/x11/util.c \
+        $$PWD/xkbcommon/src/x11/x11-keymap.c \ # renamed: keymap.c -> x11-keymap.c
+        $$PWD/xkbcommon/src/x11/x11-state.c    # renamed: state.c  -> x11-keymap.c
+}
 
 TR_EXCLUDE += $$PWD/*