diff options
Diffstat (limited to 'meta/recipes-qt/packagegroups')
-rw-r--r-- | meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb | 2 | ||||
-rw-r--r-- | meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb b/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb index 6ef844fc7c..02a649bab4 100644 --- a/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb +++ b/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb | |||
@@ -12,7 +12,7 @@ RPROVIDES_${PN} = "task-qt4e-base" | |||
12 | RREPLACES_${PN} = "task-qt4e-base" | 12 | RREPLACES_${PN} = "task-qt4e-base" |
13 | RCONFLICTS_${PN} = "task-qt4e-base" | 13 | RCONFLICTS_${PN} = "task-qt4e-base" |
14 | 14 | ||
15 | TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' | 15 | TOUCH = ' ${@bb.utils.contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' |
16 | 16 | ||
17 | RDEPENDS_${PN} = " \ | 17 | RDEPENDS_${PN} = " \ |
18 | qt4-embedded \ | 18 | qt4-embedded \ |
diff --git a/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb b/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb index c6aa753575..0e7c800946 100644 --- a/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb +++ b/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb | |||
@@ -6,6 +6,6 @@ require packagegroup-qt-toolchain-target.inc | |||
6 | 6 | ||
7 | RDEPENDS_${PN} += " \ | 7 | RDEPENDS_${PN} += " \ |
8 | qt4-x11-free-dev \ | 8 | qt4-x11-free-dev \ |
9 | ${@base_contains('DISTRO_FEATURES', 'opengl', 'libqtopengl4-dev', '', d)} \ | 9 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'libqtopengl4-dev', '', d)} \ |
10 | ${@base_contains('DISTRO_FEATURES', 'openvg', 'libqtopenvg4-dev', '', d)} \ | 10 | ${@bb.utils.contains('DISTRO_FEATURES', 'openvg', 'libqtopenvg4-dev', '', d)} \ |
11 | " | 11 | " |