diff options
| -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 @@ QT4DEPENDS ?= "qt4-x11 " DEPENDS_prepend = "${QT4DEPENDS}" -inherit qmake2 +# depends on qt4-x11 +REQUIRED_DISTRO_FEATURES += "x11" + +inherit qmake2 distro_features_check QT_BASE_NAME = "qt4" 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 = "" require packagegroup-qt-toolchain-target.inc +inherit distro_features_check +# depends on qt4-x11-free +REQUIRED_DISTRO_FEATURES = "x11" + RDEPENDS_${PN} += " \ qt4-x11-free-dev \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'libqtopengl4-dev', '', d)} \ |