summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2016-11-30 12:11:58 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2016-12-17 09:21:32 +0100
commitc0ba8ab590ba4e17a2a04925cf48915233d4f493 (patch)
tree42c69417b4aeac7675ad711a18e7d06db64f4412
parent4b5f80c1f6831d4e22de00f33f69f3992d08dfba (diff)
downloadmeta-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>
-rw-r--r--recipes-qt/qt5/qtbase_git.bb5
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"
37RDEPENDS_${PN}-tools += "perl" 37RDEPENDS_${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
44PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}" 40PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}"
45PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" 41PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}"
46PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xsync xshape xrender xrandr xfixes xinput2 xcursor glib xkb', '', d)}" 42PACKAGECONFIG_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"
124PACKAGECONFIG[linuxfb] = "-linuxfb,-no-linuxfb" 120PACKAGECONFIG[linuxfb] = "-linuxfb,-no-linuxfb"
125PACKAGECONFIG[mitshm] = "-mitshm,-no-mitshm,mitshm" 121PACKAGECONFIG[mitshm] = "-mitshm,-no-mitshm,mitshm"
126PACKAGECONFIG[kms] = "-kms,-no-kms,virtual/mesa virtual/egl" 122PACKAGECONFIG[kms] = "-kms,-no-kms,virtual/mesa virtual/egl"
127# needed for qtwebkit
128PACKAGECONFIG[icu] = "-icu,-no-icu,icu" 123PACKAGECONFIG[icu] = "-icu,-no-icu,icu"
129PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev" 124PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev"
130PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl" 125PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl"