diff options
| author | Andreas Oberritter <obi@opendreambox.org> | 2014-04-26 00:51:39 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-05-09 14:40:09 +0200 |
| commit | 3d2eca97d6439aad6b34654bc8fd67834b764572 (patch) | |
| tree | 5bff1ba0a356ba24fc022e876aa011637c2f1e33 | |
| parent | 17f240dfa98e49f14637fd146ba1de20416d0971 (diff) | |
| download | meta-qt5-3d2eca97d6439aad6b34654bc8fd67834b764572.tar.gz | |
qtbase: enable xkb by default if x11 is in DISTRO_FEATURES
Fixes "Error: -no-xkbcommon is not supported on XCB platform plugin."
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qtbase.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 89736bea..40ad56a9 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc | |||
| @@ -35,7 +35,7 @@ RDEPENDS_${PN}-tools += "perl" | |||
| 35 | # http://qt.gitorious.org/qt/qtdeclarative/commit/e988998a08b1420ed10bd02d9d4b3b8ed2289df9 | 35 | # http://qt.gitorious.org/qt/qtdeclarative/commit/e988998a08b1420ed10bd02d9d4b3b8ed2289df9 |
| 36 | PACKAGECONFIG_GL ?= "${@base_contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}" | 36 | PACKAGECONFIG_GL ?= "${@base_contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}" |
| 37 | PACKAGECONFIG_FB ?= "${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" | 37 | PACKAGECONFIG_FB ?= "${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" |
| 38 | PACKAGECONFIG_X11 ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'xcb xvideo xsync xshape xrender xrandr xfixes xinput2 xinput xinerama xcursor gtkstyle', '', d)}" | 38 | PACKAGECONFIG_X11 ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'xcb xvideo xsync xshape xrender xrandr xfixes xinput2 xinput xinerama xcursor gtkstyle xkb', '', d)}" |
| 39 | PACKAGECONFIG_FONTS ?= "" | 39 | PACKAGECONFIG_FONTS ?= "" |
| 40 | PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib" | 40 | PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib" |
| 41 | PACKAGECONFIG_MULTIMEDIA ?= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" | 41 | PACKAGECONFIG_MULTIMEDIA ?= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" |