aboutsummaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorGravatar Peter Seiderer <ps.report@gmx.net>2019-03-21 23:00:44 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2019-03-24 09:03:37 +0100
commit00de545ca78df14c8376d5f68df736ef65493687 (patch)
treee172beede8e87e814e14f8786dff734730457823 /package
parentc2c57aa30f4a77c1b7b835ed2f9002ecd35b7aac (diff)
downloadbuildroot-00de545ca78df14c8376d5f68df736ef65493687.tar.gz
buildroot-00de545ca78df14c8376d5f68df736ef65493687.tar.bz2
package/qt5base: fix xkbcommon option
- Qt 5.6: according to configure --help the command line option to enable x11 xkbcommon support is '-system-xkbcommon-x11' - Qt 5.12: according to configure --help the command line option to enable xkbcommon support is '-xkbcommon' Fixes [1]: ERROR: Invalid value given for boolean command line option 'xkbcommon'. [1] http://autobuild.buildroot.net/results/87076d03bb92a9940447ca80fc1f202e35ef39da Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package')
-rw-r--r--package/qt5/qt5base/qt5base.mk8
1 files changed, 7 insertions, 1 deletions
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index 14536980a8..fa0466dea8 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -153,7 +153,13 @@ QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-dir
QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),directfb)
ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y)
-QT5BASE_CONFIGURE_OPTS += -xcb -system-xkbcommon
+QT5BASE_CONFIGURE_OPTS += -xcb
+ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
+QT5BASE_CONFIGURE_OPTS += -system-xkbcommon-x11
+else
+QT5BASE_CONFIGURE_OPTS += -xkbcommon
+endif
+
QT5BASE_DEPENDENCIES += \
libxcb \
xcb-util-wm \