diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2019-05-14 10:48:57 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2020-02-14 18:19:10 +0100 |
commit | f53015678f22615eb5a23b093496ea9c63927812 (patch) | |
tree | 0cacb1faf139b23fbbbdee595045932a8c97fa1d | |
parent | cb6f59197fa52f80ad9ef96082eea31a1b7c15e9 (diff) | |
download | meta-qt5-f53015678f22615eb5a23b093496ea9c63927812.tar.gz |
qtbase: add accessibility from PACKAGECONFIG_KDE to PACKAGECONFIG_DEFAULT
* the original goal was to keep the default PACKAGECONFIG as minimal
as possible, but I think it's time to enable this
* most builds probably have this enabled anyway because of other dependencies
* new qtbase also shows a warning when it's disabled:
WARNING: Accessibility disabled. This configuration of Qt is unsupported.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 944d2265..2835ab70 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -67,7 +67,7 @@ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -f | |||
67 | PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}" | 67 | PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}" |
68 | PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" | 68 | PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" |
69 | PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xinput2 glib xkb xkbcommon-evdev', '', d)}" | 69 | PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xinput2 glib xkb xkbcommon-evdev', '', d)}" |
70 | PACKAGECONFIG_KDE ?= "${@bb.utils.contains('DISTRO_FEATURES', 'kde', 'sm cups fontconfig kms gbm libinput sql-sqlite accessibility openssl', '', d)}" | 70 | PACKAGECONFIG_KDE ?= "${@bb.utils.contains('DISTRO_FEATURES', 'kde', 'sm cups fontconfig kms gbm libinput sql-sqlite openssl', '', d)}" |
71 | PACKAGECONFIG_FONTS ?= "" | 71 | PACKAGECONFIG_FONTS ?= "" |
72 | PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib" | 72 | PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib" |
73 | PACKAGECONFIG_DISTRO ?= "" | 73 | PACKAGECONFIG_DISTRO ?= "" |
@@ -75,7 +75,7 @@ PACKAGECONFIG_DISTRO ?= "" | |||
75 | PACKAGECONFIG_RELEASE ?= "release" | 75 | PACKAGECONFIG_RELEASE ?= "release" |
76 | # This is in qt5.inc, because qtwebkit-examples are using it to enable ca-certificates dependency | 76 | # This is in qt5.inc, because qtwebkit-examples are using it to enable ca-certificates dependency |
77 | # PACKAGECONFIG_OPENSSL ?= "openssl" | 77 | # PACKAGECONFIG_OPENSSL ?= "openssl" |
78 | PACKAGECONFIG_DEFAULT ?= "dbus udev evdev widgets tools libs freetype tests \ | 78 | PACKAGECONFIG_DEFAULT ?= "accessibility dbus udev evdev widgets tools libs freetype tests \ |
79 | ${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Os', 'optimize-size ltcg', '', d)} \ | 79 | ${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Os', 'optimize-size ltcg', '', d)} \ |
80 | ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'static', '', d)} \ | 80 | ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'static', '', d)} \ |
81 | " | 81 | " |