diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2016-06-08 16:00:04 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-06-13 21:13:39 +0200 |
| commit | 15a4f86005e4435b9e0a2f1e7d0477e327fcbe83 (patch) | |
| tree | d25894f69613dd021c8295de8373889bc5ae8cd7 | |
| parent | 2e995dd9c11f3f49ca14e2266f2147cd9d66ff80 (diff) | |
| download | meta-qt5-15a4f86005e4435b9e0a2f1e7d0477e327fcbe83.tar.gz | |
qtwayland: add dependency on libxcomposite
* fixes QA:
qtwayland-5.6.99+5.7.0-beta+gitAUTOINC+d27075a3f9: qtwayland-plugins rdepends on libxcomposite, but it isn't a build dependency, missing libxcomposite in DEPENDS or PACKAGECONFIG? [build-deps]
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qtwayland_git.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 8f016583..e36d2c0a 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb | |||
| @@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = " \ | |||
| 16 | # libxkbcommon isn't mandatory make it easier to remove by .bbappend | 16 | # libxkbcommon isn't mandatory make it easier to remove by .bbappend |
| 17 | # (e.g. for building qtwayland with danny which doesn't have libxkbcommon in oe-core). | 17 | # (e.g. for building qtwayland with danny which doesn't have libxkbcommon in oe-core). |
| 18 | XKB_DEPENDS = "libxkbcommon xproto" | 18 | XKB_DEPENDS = "libxkbcommon xproto" |
| 19 | DEPENDS += "qtbase qtdeclarative wayland wayland-native qtwayland-native ${XKB_DEPENDS}" | 19 | DEPENDS += "qtbase qtdeclarative wayland wayland-native qtwayland-native ${XKB_DEPENDS} ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcomposite', '', d)}" |
| 20 | 20 | ||
| 21 | QT_WAYLAND_CONFIG ?= "wayland-compositor" | 21 | QT_WAYLAND_CONFIG ?= "wayland-compositor" |
| 22 | QT_WAYLAND_DEFINES ?= "" | 22 | QT_WAYLAND_DEFINES ?= "" |