diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2016-08-24 16:10:41 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2016-08-29 22:44:35 +0000 |
| commit | 547d3f0ebe7283b6af1b19f808ad75ea581a4e09 (patch) | |
| tree | a647fb215f523d9ff3f4cb6008ecbdcda6944e7f /src/plugins/platforms/xcb | |
| parent | 1cc571593a67f3e688a5cbb896f0be71ca5a2b30 (diff) | |
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>
Diffstat (limited to 'src/plugins/platforms/xcb')
| -rw-r--r-- | src/plugins/platforms/xcb/xcb_qpa_lib.pro | 6 |
1 files changed, 5 insertions, 1 deletions
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 } |