diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/qt4x11.bbclass | 5 | ||||
-rw-r--r-- | meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/meta/classes/qt4x11.bbclass b/meta/classes/qt4x11.bbclass index b06e15d29e..6f06d34755 100644 --- a/meta/classes/qt4x11.bbclass +++ b/meta/classes/qt4x11.bbclass | |||
@@ -1,7 +1,10 @@ | |||
1 | QT4DEPENDS ?= "qt4-x11 " | 1 | QT4DEPENDS ?= "qt4-x11 " |
2 | DEPENDS_prepend = "${QT4DEPENDS}" | 2 | DEPENDS_prepend = "${QT4DEPENDS}" |
3 | 3 | ||
4 | inherit qmake2 | 4 | # depends on qt4-x11 |
5 | REQUIRED_DISTRO_FEATURES += "x11" | ||
6 | |||
7 | inherit qmake2 distro_features_check | ||
5 | 8 | ||
6 | QT_BASE_NAME = "qt4" | 9 | QT_BASE_NAME = "qt4" |
7 | QT_DIR_NAME = "qt4" | 10 | QT_DIR_NAME = "qt4" |
diff --git a/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb b/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb index 0e7c800946..772c151d25 100644 --- a/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb +++ b/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb | |||
@@ -4,6 +4,10 @@ QTLIBPREFIX = "" | |||
4 | 4 | ||
5 | require packagegroup-qt-toolchain-target.inc | 5 | require packagegroup-qt-toolchain-target.inc |
6 | 6 | ||
7 | inherit distro_features_check | ||
8 | # depends on qt4-x11-free | ||
9 | REQUIRED_DISTRO_FEATURES = "x11" | ||
10 | |||
7 | RDEPENDS_${PN} += " \ | 11 | RDEPENDS_${PN} += " \ |
8 | qt4-x11-free-dev \ | 12 | qt4-x11-free-dev \ |
9 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'libqtopengl4-dev', '', d)} \ | 13 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'libqtopengl4-dev', '', d)} \ |