diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2016-04-30 13:57:09 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-05-02 15:16:07 +0200 |
commit | 802b395222054f39501f1e02879d5c708b3da8d9 (patch) | |
tree | ba4c6ba17e934b4eda23f481dda0a3751c4da7e9 /recipes-qt | |
parent | 754aaadc7f0a1c98a4895899617afbaef0f1cdfa (diff) | |
download | meta-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')
-rw-r--r-- | recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb | 34 | ||||
-rw-r--r-- | recipes-qt/qt5/qt5.inc | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 10 | ||||
-rw-r--r-- | recipes-qt/qt5/qtdeclarative_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtimageformats_git.bb | 8 | ||||
-rw-r--r-- | recipes-qt/qt5/qtlocation_git.bb | 4 | ||||
-rw-r--r-- | recipes-qt/qt5/qttools_git.bb | 4 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebkit-examples_git.bb | 2 |
9 files changed, 34 insertions, 34 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 = " \ | |||
36 | RDEPENDS_${PN} += " \ | 36 | RDEPENDS_${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 \ |
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 85d7d892..f9cb2b47 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc | |||
@@ -6,7 +6,7 @@ inherit qmake5 | |||
6 | PACKAGECONFIG_OPENSSL ?= "openssl" | 6 | PACKAGECONFIG_OPENSSL ?= "openssl" |
7 | 7 | ||
8 | PACKAGECONFIG[examples] = "" | 8 | PACKAGECONFIG[examples] = "" |
9 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'examples', 'QT_BUILD_PARTS+=examples', '', d)}" | 9 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'examples', 'QT_BUILD_PARTS+=examples', '', d)}" |
10 | 10 | ||
11 | # we don't want conflicts with qt4 | 11 | # we don't want conflicts with qt4 |
12 | OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}" | 12 | OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 09f8ebde..b85c5632 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -34,12 +34,12 @@ RDEPENDS_${PN}-tools += "perl" | |||
34 | # PACKAGECONFIG is kept rather minimal for people who don't need | 34 | # PACKAGECONFIG is kept rather minimal for people who don't need |
35 | # stuff like webkit (and it's easier to add options than remove) | 35 | # stuff like webkit (and it's easier to add options than remove) |
36 | 36 | ||
37 | PACKAGECONFIG_GL ?= "${@base_contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}" | 37 | PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}" |
38 | PACKAGECONFIG_FB ?= "${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" | 38 | PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" |
39 | PACKAGECONFIG_X11 ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'xcb xvideo xsync xshape xrender xrandr xfixes xinput2 xinput xinerama xcursor glib gtkstyle xkb', '', d)}" | 39 | PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xvideo xsync xshape xrender xrandr xfixes xinput2 xinput xinerama xcursor glib gtkstyle xkb', '', d)}" |
40 | PACKAGECONFIG_FONTS ?= "" | 40 | PACKAGECONFIG_FONTS ?= "" |
41 | PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib" | 41 | PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib" |
42 | PACKAGECONFIG_MULTIMEDIA ?= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" | 42 | PACKAGECONFIG_MULTIMEDIA ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" |
43 | PACKAGECONFIG_DISTRO ?= "" | 43 | PACKAGECONFIG_DISTRO ?= "" |
44 | # Either release or debug, can be overridden in bbappends | 44 | # Either release or debug, can be overridden in bbappends |
45 | PACKAGECONFIG_RELEASE ?= "release" | 45 | PACKAGECONFIG_RELEASE ?= "release" |
@@ -254,7 +254,7 @@ FILES_${PN}-fonts-qpf = "${OE_QMAKE_PATH_QT_FONTS}/*.qpf*" | |||
254 | FILES_${PN}-fonts = "${OE_QMAKE_PATH_QT_FONTS}/README \ | 254 | FILES_${PN}-fonts = "${OE_QMAKE_PATH_QT_FONTS}/README \ |
255 | ${OE_QMAKE_PATH_QT_FONTS}/fontdir" | 255 | ${OE_QMAKE_PATH_QT_FONTS}/fontdir" |
256 | 256 | ||
257 | RRECOMMENDS_${PN}-plugins += "${@base_contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" | 257 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" |
258 | 258 | ||
259 | sysroot_stage_dirs_append() { | 259 | sysroot_stage_dirs_append() { |
260 | # $to is 2nd parameter passed to sysroot_stage_dir, e.g. ${SYSROOT_DESTDIR} passed from sysroot_stage_all | 260 | # $to is 2nd parameter passed to sysroot_stage_dir, e.g. ${SYSROOT_DESTDIR} passed from sysroot_stage_all |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index bf3a1085..72b3d7be 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
@@ -32,7 +32,7 @@ do_configure_prepend() { | |||
32 | echo "QT_TOOL.syncqt.binary = \"${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/syncqt\"" > ${B}/.qmake.cache | 32 | echo "QT_TOOL.syncqt.binary = \"${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/syncqt\"" > ${B}/.qmake.cache |
33 | } | 33 | } |
34 | 34 | ||
35 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" | 35 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" |
36 | 36 | ||
37 | SRCREV = "26ff8f9029107877bfbfdc2f099f9b11861183ed" | 37 | SRCREV = "26ff8f9029107877bfbfdc2f099f9b11861183ed" |
38 | 38 | ||
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 4c4431d4..573b3303 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb | |||
@@ -23,9 +23,9 @@ PACKAGECONFIG[libmng] = ",,libmng" | |||
23 | PACKAGECONFIG[libtiff] = ",,tiff" | 23 | PACKAGECONFIG[libtiff] = ",,tiff" |
24 | PACKAGECONFIG[libwebp] = ",,libwebp" | 24 | PACKAGECONFIG[libwebp] = ",,libwebp" |
25 | 25 | ||
26 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libmng', 'CONFIG+=OE_LIBMNG_ENABLED', '', d)}" | 26 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libmng', 'CONFIG+=OE_LIBMNG_ENABLED', '', d)}" |
27 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'jasper', 'CONFIG+=OE_JASPER_ENABLED', '', d)}" | 27 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'jasper', 'CONFIG+=OE_JASPER_ENABLED', '', d)}" |
28 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}" | 28 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}" |
29 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}" | 29 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}" |
30 | 30 | ||
31 | SRCREV = "bf5b49878d75d316f31225f76152e8381a3d5f0f" | 31 | SRCREV = "bf5b49878d75d316f31225f76152e8381a3d5f0f" |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index d573b6b9..8a41551b 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb | |||
@@ -26,7 +26,7 @@ do_configure_prepend() { | |||
26 | sed -i -e 's/^\(qtCompileTest(gypsy)\)/OE_GYPSY_ENABLED:\1/' ${S}/qtlocation.pro | 26 | sed -i -e 's/^\(qtCompileTest(gypsy)\)/OE_GYPSY_ENABLED:\1/' ${S}/qtlocation.pro |
27 | } | 27 | } |
28 | 28 | ||
29 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}" | 29 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}" |
30 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}" | 30 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}" |
31 | 31 | ||
32 | SRCREV = "d1f66746ab0b77b4f3300cbeeaafe61d25d78e98" | 32 | SRCREV = "d1f66746ab0b77b4f3300cbeeaafe61d25d78e98" |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 3a27bbd7..e0b23b4b 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
@@ -28,8 +28,8 @@ PACKAGECONFIG_class-nativesdk ??= "linguistonly" | |||
28 | PACKAGECONFIG[linguistonly] = "" | 28 | PACKAGECONFIG[linguistonly] = "" |
29 | PACKAGECONFIG[qtwebkit] = ",,qtwebkit" | 29 | PACKAGECONFIG[qtwebkit] = ",,qtwebkit" |
30 | 30 | ||
31 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" | 31 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" |
32 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}" | 32 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}" |
33 | 33 | ||
34 | SRCREV = "e33532e048fa12ee32429ca83ee31aa8f065147d" | 34 | SRCREV = "e33532e048fa12ee32429ca83ee31aa8f065147d" |
35 | 35 | ||
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 98b4babe..427cd958 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -22,7 +22,7 @@ DEPENDS += " \ | |||
22 | # qtwebengine will have additional dependencies: | 22 | # qtwebengine will have additional dependencies: |
23 | # contains(QT_CONFIG, xcb): REQUIRED_PACKAGES += libdrm xcomposite xcursor xi xrandr xscrnsaver xtst | 23 | # contains(QT_CONFIG, xcb): REQUIRED_PACKAGES += libdrm xcomposite xcursor xi xrandr xscrnsaver xtst |
24 | # xscreensaver isn't covered in qtbase DEPENDS | 24 | # xscreensaver isn't covered in qtbase DEPENDS |
25 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'libxscrnsaver', '', d)}" | 25 | DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxscrnsaver', '', d)}" |
26 | 26 | ||
27 | DEPENDS += "yasm-native" | 27 | DEPENDS += "yasm-native" |
28 | EXTRA_QMAKEVARS_PRE += "GYP_CONFIG+=use_system_yasm" | 28 | EXTRA_QMAKEVARS_PRE += "GYP_CONFIG+=use_system_yasm" |
diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb index 63d02fac..933220de 100644 --- a/recipes-qt/qt5/qtwebkit-examples_git.bb +++ b/recipes-qt/qt5/qtwebkit-examples_git.bb | |||
@@ -17,6 +17,6 @@ PACKAGECONFIG ?= "examples" | |||
17 | 17 | ||
18 | DEPENDS += "qtwebkit qtxmlpatterns" | 18 | DEPENDS += "qtwebkit qtxmlpatterns" |
19 | RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" | 19 | RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" |
20 | RDEPENDS_${PN}-examples += "${@base_contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" | 20 | RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" |
21 | 21 | ||
22 | SRCREV = "1b9a0fc9d1ded4f4f11b04eb0bb7d1de82d6eb34" | 22 | SRCREV = "1b9a0fc9d1ded4f4f11b04eb0bb7d1de82d6eb34" |