summaryrefslogtreecommitdiffstats
path: root/qt5-layer
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2016-05-04 20:06:30 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2016-05-06 18:24:48 -0300
commite1d51d42a7edf21226f6bd71ec4be0733f9c660a (patch)
tree21509752e9daf46e6b38cee4e9260f26b4e00f74 /qt5-layer
parent6979c3dea9c9b268790ddbf3db484d772707a354 (diff)
downloadmeta-fsl-arm-e1d51d42a7edf21226f6bd71ec4be0733f9c660a.tar.gz
qtbase: Stop using base_contains
The base_contains function is deprecated and we ought to use bb.utils.contains instead. Change-Id: Ib53b854f79f45ecd75da9f5c07a276465f2675fb Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'qt5-layer')
-rw-r--r--qt5-layer/recipes-qt/qt5/qtbase_%.bbappend12
1 files changed, 6 insertions, 6 deletions
diff --git a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
index b18bf17..d336c0f 100644
--- a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
+++ b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
@@ -1,6 +1,6 @@
1# Copyright (C) 2013 Eric Bénard - Eukréa Electromatique 1# Copyright (C) 2013 Eric Bénard - Eukréa Electromatique
2 2
3HAS_X11 = "${@base_contains('DISTRO_FEATURES', 'x11', 1, 0, d)}" 3HAS_X11 = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 1, 0, d)}"
4 4
5IS_MX6SL = "0" 5IS_MX6SL = "0"
6IS_MX6SL_mx6sl = "1" 6IS_MX6SL_mx6sl = "1"
@@ -8,11 +8,11 @@ IS_MX6SL_mx6sl = "1"
8PACKAGECONFIG_GL_mx6q = "gles2" 8PACKAGECONFIG_GL_mx6q = "gles2"
9PACKAGECONFIG_GL_mx6dl = "gles2" 9PACKAGECONFIG_GL_mx6dl = "gles2"
10PACKAGECONFIG_GL_mx6sx = "gles2" 10PACKAGECONFIG_GL_mx6sx = "gles2"
11PACKAGECONFIG_GL_mx6sl = "${@base_contains('DISTRO_FEATURES', 'x11', ' gl', '', d)}" 11PACKAGECONFIG_GL_mx6sl = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' gl', '', d)}"
12QT_CONFIG_FLAGS_append_mx6q = "${@base_contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', ' -eglfs', d)}" 12QT_CONFIG_FLAGS_append_mx6q = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', ' -eglfs', d)}"
13QT_CONFIG_FLAGS_append_mx6dl = "${@base_contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', ' -eglfs', d)}" 13QT_CONFIG_FLAGS_append_mx6dl = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', ' -eglfs', d)}"
14QT_CONFIG_FLAGS_append_mx6sx = "${@base_contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', ' -eglfs', d)}" 14QT_CONFIG_FLAGS_append_mx6sx = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', ' -eglfs', d)}"
15QT_CONFIG_FLAGS_append_mx6sl = "${@base_contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', \ 15QT_CONFIG_FLAGS_append_mx6sl = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', \
16 ' -no-opengl -linuxfb -no-eglfs', d)}" 16 ' -no-opengl -linuxfb -no-eglfs', d)}"
17 17
18do_configure_prepend_mx6() { 18do_configure_prepend_mx6() {