summaryrefslogtreecommitdiffstats
path: root/recipes-qt/packagegroups
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2016-04-30 13:57:09 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2016-05-02 15:16:07 +0200
commit802b395222054f39501f1e02879d5c708b3da8d9 (patch)
treeba4c6ba17e934b4eda23f481dda0a3751c4da7e9 /recipes-qt/packagegroups
parent754aaadc7f0a1c98a4895899617afbaef0f1cdfa (diff)
downloadmeta-qt5-802b395222054f39501f1e02879d5c708b3da8d9.tar.gz
replace base_contains by bb.utils.contains
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/packagegroups')
-rw-r--r--recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb34
1 files changed, 17 insertions, 17 deletions
diff --git a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
index cc4d4b5f..f64db8f0 100644
--- a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
+++ b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
@@ -12,11 +12,11 @@ USE_RUBY = " \
12 qtquick1-dev \ 12 qtquick1-dev \
13 qtquick1-mkspecs \ 13 qtquick1-mkspecs \
14 qtquick1-plugins \ 14 qtquick1-plugins \
15 ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtquick1-qmlplugins', '', d)} \ 15 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtquick1-qmlplugins', '', d)} \
16 qttranslations-qtquick1 \ 16 qttranslations-qtquick1 \
17 qtwebkit-dev \ 17 qtwebkit-dev \
18 qtwebkit-mkspecs \ 18 qtwebkit-mkspecs \
19 ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtwebkit-qmlplugins', '', d)} \ 19 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtwebkit-qmlplugins', '', d)} \
20" 20"
21 21
22# Requires Wayland to work 22# Requires Wayland to work
@@ -36,9 +36,9 @@ USE_X11 = " \
36RDEPENDS_${PN} += " \ 36RDEPENDS_${PN} += " \
37 packagegroup-core-standalone-sdk-target \ 37 packagegroup-core-standalone-sdk-target \
38 libsqlite3-dev \ 38 libsqlite3-dev \
39 ${@base_contains('DISTRO_FEATURES', 'opengl', 'qt3d-dev', '', d)} \ 39 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qt3d-dev', '', d)} \
40 ${@base_contains('DISTRO_FEATURES', 'opengl', 'qt3d-mkspecs', '', d)} \ 40 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qt3d-mkspecs', '', d)} \
41 ${@base_contains('DISTRO_FEATURES', 'opengl', 'qt3d-qmlplugins', '', d)} \ 41 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qt3d-qmlplugins', '', d)} \
42 qtbase-dev \ 42 qtbase-dev \
43 qtbase-fonts \ 43 qtbase-fonts \
44 qtbase-mkspecs \ 44 qtbase-mkspecs \
@@ -50,30 +50,30 @@ RDEPENDS_${PN} += " \
50 qttranslations-qthelp \ 50 qttranslations-qthelp \
51 qtconnectivity-dev \ 51 qtconnectivity-dev \
52 qtconnectivity-mkspecs \ 52 qtconnectivity-mkspecs \
53 ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtconnectivity-qmlplugins', '', d)} \ 53 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtconnectivity-qmlplugins', '', d)} \
54 qttranslations-qtconnectivity \ 54 qttranslations-qtconnectivity \
55 qtdeclarative-dev \ 55 qtdeclarative-dev \
56 qtdeclarative-mkspecs \ 56 qtdeclarative-mkspecs \
57 qtdeclarative-plugins \ 57 qtdeclarative-plugins \
58 ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtdeclarative-qmlplugins', '', d)} \ 58 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtdeclarative-qmlplugins', '', d)} \
59 qtdeclarative-staticdev \ 59 qtdeclarative-staticdev \
60 qttranslations-qmlviewer \ 60 qttranslations-qmlviewer \
61 qttranslations-qtdeclarative \ 61 qttranslations-qtdeclarative \
62 qtenginio-dev \ 62 qtenginio-dev \
63 qtenginio-mkspecs \ 63 qtenginio-mkspecs \
64 ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtenginio-qmlplugins', '', d)} \ 64 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtenginio-qmlplugins', '', d)} \
65 ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtgraphicaleffects-qmlplugins', '', d)} \ 65 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtgraphicaleffects-qmlplugins', '', d)} \
66 qtimageformats-dev \ 66 qtimageformats-dev \
67 qtimageformats-plugins \ 67 qtimageformats-plugins \
68 qtlocation-dev \ 68 qtlocation-dev \
69 qtlocation-mkspecs \ 69 qtlocation-mkspecs \
70 qtlocation-plugins \ 70 qtlocation-plugins \
71 ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtlocation-qmlplugins', '', d)} \ 71 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtlocation-qmlplugins', '', d)} \
72 qttranslations-qtlocation \ 72 qttranslations-qtlocation \
73 qtmultimedia-dev \ 73 qtmultimedia-dev \
74 qtmultimedia-mkspecs \ 74 qtmultimedia-mkspecs \
75 qtmultimedia-plugins \ 75 qtmultimedia-plugins \
76 ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtmultimedia-qmlplugins', '', d)} \ 76 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtmultimedia-qmlplugins', '', d)} \
77 qttranslations-qtmultimedia \ 77 qttranslations-qtmultimedia \
78 qtscript-dev \ 78 qtscript-dev \
79 qtscript-mkspecs \ 79 qtscript-mkspecs \
@@ -81,7 +81,7 @@ RDEPENDS_${PN} += " \
81 qtsensors-dev \ 81 qtsensors-dev \
82 qtsensors-mkspecs \ 82 qtsensors-mkspecs \
83 qtsensors-plugins \ 83 qtsensors-plugins \
84 ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtsensors-qmlplugins', '', d)} \ 84 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtsensors-qmlplugins', '', d)} \
85 qtserialport-dev \ 85 qtserialport-dev \
86 qtserialport-mkspecs \ 86 qtserialport-mkspecs \
87 qtsvg-dev \ 87 qtsvg-dev \
@@ -89,21 +89,21 @@ RDEPENDS_${PN} += " \
89 qtsvg-plugins \ 89 qtsvg-plugins \
90 qtsystems-dev \ 90 qtsystems-dev \
91 qtsystems-mkspecs \ 91 qtsystems-mkspecs \
92 ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtsystems-qmlplugins', '', d)} \ 92 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtsystems-qmlplugins', '', d)} \
93 qttools-dev \ 93 qttools-dev \
94 qttools-mkspecs \ 94 qttools-mkspecs \
95 qttools-staticdev \ 95 qttools-staticdev \
96 qttools-tools \ 96 qttools-tools \
97 ${@base_contains('DISTRO_FEATURES', 'wayland', '${USE_WAYLAND}', '', d)} \ 97 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '${USE_WAYLAND}', '', d)} \
98 ${USE_RUBY} \ 98 ${USE_RUBY} \
99 ${@base_contains('DISTRO_FEATURES', 'x11', '${USE_X11}', '', d)} \ 99 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${USE_X11}', '', d)} \
100 qtwebsockets-dev \ 100 qtwebsockets-dev \
101 qtwebsockets-mkspecs \ 101 qtwebsockets-mkspecs \
102 ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtwebsockets-qmlplugins', '', d)} \ 102 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtwebsockets-qmlplugins', '', d)} \
103 qttranslations-qtwebsockets \ 103 qttranslations-qtwebsockets \
104 qtwebchannel-dev \ 104 qtwebchannel-dev \
105 qtwebchannel-mkspecs \ 105 qtwebchannel-mkspecs \
106 ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtwebchannel-qmlplugins', '', d)} \ 106 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtwebchannel-qmlplugins', '', d)} \
107 qtxmlpatterns-dev \ 107 qtxmlpatterns-dev \
108 qtxmlpatterns-mkspecs \ 108 qtxmlpatterns-mkspecs \
109 qttranslations-qtxmlpatterns \ 109 qttranslations-qtxmlpatterns \