3 files changed, 18 insertions, 2 deletions
diff --git a/src/plugins/platforminputcontexts/compose/compose.pro b/src/plugins/platforminputcontexts/compose/compose.pro
index 6387a47a4c..8c73d29971 100644
--- a/src/plugins/platforminputcontexts/compose/compose.pro
+++ b/src/plugins/platforminputcontexts/compose/compose.pro
@@ -17,4 +17,13 @@ HEADERS += $$PWD/qcomposeplatforminputcontext.h \
            $$PWD/generator/qtablegenerator.h \
            $$PWD/xkbcommon_workaround.h \
 
+# libxkbcommon
+contains(QT_CONFIG, xkbcommon-qt): {
+    include(../../../3rdparty/xkbcommon.pri)
+} else {
+    LIBS += $$QMAKE_LIBS_XKBCOMMON
+    QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XKBCOMMON
+    LIBS += -lxkbcommon
+}
+
 OTHER_FILES += $$PWD/compose.json
diff --git a/src/plugins/platforminputcontexts/platforminputcontexts.pro b/src/plugins/platforminputcontexts/platforminputcontexts.pro
index fb58de5edc..733b70be58 100644
--- a/src/plugins/platforminputcontexts/platforminputcontexts.pro
+++ b/src/plugins/platforminputcontexts/platforminputcontexts.pro
@@ -4,7 +4,7 @@ qtHaveModule(dbus) {
 !mac:!win32:SUBDIRS += ibus maliit
 }
 
-unix:!macx:contains(QT_CONFIG, xkbcommon): {
+unix:!macx:!contains(DEFINES, QT_NO_XKBCOMMON): {
     SUBDIRS += compose
 }
 
diff --git a/src/plugins/platforms/xcb/xcb-plugin.pro b/src/plugins/platforms/xcb/xcb-plugin.pro
index 5823e97f36..99429333d6 100644
--- a/src/plugins/platforms/xcb/xcb-plugin.pro
+++ b/src/plugins/platforms/xcb/xcb-plugin.pro
@@ -6,7 +6,6 @@ load(qt_plugin)
 
 QT += core-private gui-private platformsupport-private
 
-
 SOURCES = \
         qxcbclipboard.cpp \
         qxcbconnection.cpp \
@@ -116,3 +115,11 @@ contains(QT_CONFIG, xcb-qt) {
     !contains(DEFINES, QT_NO_SHAPE):LIBS += -lxcb-shape
 }
 
+# libxkbcommon
+contains(QT_CONFIG, xkbcommon-qt): {
+    include(../../../3rdparty/xkbcommon.pri)
+} else {
+    LIBS += $$QMAKE_LIBS_XKBCOMMON
+    QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XKBCOMMON
+    LIBS += -lxkbcommon
+}