From 547d3f0ebe7283b6af1b19f808ad75ea581a4e09 Mon Sep 17 00:00:00 2001
From: Laszlo Agocs <laszlo.agocs@qt.io>
Date: Wed, 24 Aug 2016 16:10:41 +0200
Subject: Fix bundled xkbcommon build without xcb-xkb present

The condition went missing in the process of cleaning up.

Change-Id: If4f7958e5e5983c86f86a009aaa88d1f5e7ec76d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/plugins/platforms/xcb/xcb_qpa_lib.pro | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/plugins/platforms/xcb/xcb_qpa_lib.pro b/src/plugins/platforms/xcb/xcb_qpa_lib.pro
index 3c7badce5f..ec0fa68871 100644
--- a/src/plugins/platforms/xcb/xcb_qpa_lib.pro
+++ b/src/plugins/platforms/xcb/xcb_qpa_lib.pro
@@ -88,7 +88,11 @@ qtConfig(dbus-linked): \
 
 # libxkbcommon
 !qtConfig(xkbcommon-system) {
-    include(../../../3rdparty/xkbcommon-x11.pri)
+    qtConfig(xkb) {
+        include(../../../3rdparty/xkbcommon-x11.pri)
+    } else {
+        include(../../../3rdparty/xkbcommon.pri)
+    }
 } else {
     QMAKE_USE += xkbcommon
 }
-- 
cgit v1.2.3