diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2014-04-24 15:59:20 -0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-25 17:19:19 +0100 |
commit | 4c14b094985216c433d330fb3d9532d4b6c91fcf (patch) | |
tree | 6970f383436ca29450779bd98c378aae89f2e079 /meta/recipes-qt/qt4/qt4.inc | |
parent | 08a38a7865c41ec60f4b993b964f8d477ea0f680 (diff) | |
download | poky-4c14b094985216c433d330fb3d9532d4b6c91fcf.tar.gz |
Globally replace 'base_contains' calls with 'bb.utils.contains'
The base_contains is kept as a compatibility method and we ought to
not use it in OE-Core so we can remove it from base metadata in
future.
(From OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4.inc')
-rw-r--r-- | meta/recipes-qt/qt4/qt4.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index 9a10138e94..0023f16a6c 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc | |||
@@ -1,7 +1,7 @@ | |||
1 | inherit qmake_base | 1 | inherit qmake_base |
2 | 2 | ||
3 | DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gstreamer gst-plugins-base sqlite3 tiff icu" | 3 | DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gstreamer gst-plugins-base sqlite3 tiff icu" |
4 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" | 4 | DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" |
5 | 5 | ||
6 | require qt4_arch.inc | 6 | require qt4_arch.inc |
7 | 7 | ||
@@ -18,7 +18,7 @@ QT_XML ?= "-xmlpatterns" | |||
18 | QT_WEBKIT ?= "-webkit" | 18 | QT_WEBKIT ?= "-webkit" |
19 | QT_PHONON ?= "-phonon" | 19 | QT_PHONON ?= "-phonon" |
20 | QT_DBUS ?= "-qdbus" | 20 | QT_DBUS ?= "-qdbus" |
21 | QT_MULTIMEDIA ?= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', '-pulseaudio', '-no-pulseaudio', d)}" | 21 | QT_MULTIMEDIA ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', '-pulseaudio', '-no-pulseaudio', d)}" |
22 | 22 | ||
23 | QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \ | 23 | QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \ |
24 | -shared -no-nas-sound -no-nis \ | 24 | -shared -no-nas-sound -no-nis \ |