diff options
| author | Andreas Oberritter <obi@opendreambox.org> | 2016-11-30 12:11:58 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-12-17 09:21:32 +0100 |
| commit | c0ba8ab590ba4e17a2a04925cf48915233d4f493 (patch) | |
| tree | 42c69417b4aeac7675ad711a18e7d06db64f4412 /recipes-qt/qt5/qtbase_git.bb | |
| parent | 4b5f80c1f6831d4e22de00f33f69f3992d08dfba (diff) | |
| download | meta-qt5-c0ba8ab590ba4e17a2a04925cf48915233d4f493.tar.gz | |
qtbase: Remove comments about ICU and QtWebKit
QtWebKit doesn't depend on icu in qtbase. It just didn't enable
it manually before.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 223383dd..6541973e 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
| @@ -37,10 +37,6 @@ DEPENDS += "qtbase-native" | |||
| 37 | RDEPENDS_${PN}-tools += "perl" | 37 | RDEPENDS_${PN}-tools += "perl" |
| 38 | 38 | ||
| 39 | # separate some parts of PACKAGECONFIG which are often changed | 39 | # separate some parts of PACKAGECONFIG which are often changed |
| 40 | # be aware that you need to add icu to build qtwebkit, default | ||
| 41 | # PACKAGECONFIG is kept rather minimal for people who don't need | ||
| 42 | # stuff like webkit (and it's easier to add options than remove) | ||
| 43 | |||
| 44 | PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}" | 40 | PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}" |
| 45 | PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" | 41 | PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" |
| 46 | PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xsync xshape xrender xrandr xfixes xinput2 xcursor glib xkb', '', d)}" | 42 | PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xsync xshape xrender xrandr xfixes xinput2 xcursor glib xkb', '', d)}" |
| @@ -124,7 +120,6 @@ PACKAGECONFIG[directfb] = "-directfb,-no-directfb,directfb" | |||
| 124 | PACKAGECONFIG[linuxfb] = "-linuxfb,-no-linuxfb" | 120 | PACKAGECONFIG[linuxfb] = "-linuxfb,-no-linuxfb" |
| 125 | PACKAGECONFIG[mitshm] = "-mitshm,-no-mitshm,mitshm" | 121 | PACKAGECONFIG[mitshm] = "-mitshm,-no-mitshm,mitshm" |
| 126 | PACKAGECONFIG[kms] = "-kms,-no-kms,virtual/mesa virtual/egl" | 122 | PACKAGECONFIG[kms] = "-kms,-no-kms,virtual/mesa virtual/egl" |
| 127 | # needed for qtwebkit | ||
| 128 | PACKAGECONFIG[icu] = "-icu,-no-icu,icu" | 123 | PACKAGECONFIG[icu] = "-icu,-no-icu,icu" |
| 129 | PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev" | 124 | PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev" |
| 130 | PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl" | 125 | PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl" |
