diff options
author | Jani Suonpera <jani.suonpera@qt.io> | 2021-09-22 13:44:05 +0300 |
---|---|---|
committer | Jani Suonpera <jani.suonpera@qt.io> | 2021-09-23 06:30:11 +0000 |
commit | 9155b94538e1834f3b2027f13699727772d3ecbc (patch) | |
tree | 6fbece63baeb3154ad0c04ace28c98bc196fab0b /recipes-qt/qt5/qtwayland_git.bb | |
parent | 1a30142e7cfd82962fbacfc6b65f5c1fc046aa5d (diff) | |
parent | 10f3673fd4b6c6e1e61c23478802f83652475a5f (diff) |
Merge commit '10f3673f' into lts-5.15
10f3673f is last SHA1 in upstream master,
which does not include Yocto branch Honister.
Task-number: QTBUG-96310
Change-Id: I6c9cb67693d8594d727d91e559b190db633a0f67
Diffstat (limited to 'recipes-qt/qt5/qtwayland_git.bb')
-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 4982dfd1..d5559279 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -20,7 +20,7 @@ SRC_URI += "file://0001-tst_seatv4-Include-array.patch" PACKAGECONFIG ?= " \ wayland-client \ wayland-server \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'wayland-egl', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl wayland', 'wayland-egl', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcomposite-egl xcomposite-glx', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', 'wayland-vulkan-server-buffer', '', d)} \ " |