diff options
| author |   Marius Vlad <marius.vlad@collabora.com> | 2020-05-12 13:17:54 +0300 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2020-05-13 11:53:57 +0000 |
| commit | 91524b2cbe2b81d9cadcb1e0a1f30df3c00078b5 (patch) | |
| tree | 3cd178a711b07a4aef6018b85f48d352f04e9fd6 /meta-app-framework | |
| parent | 9ebcdd9ea2144c7112accd9b2a1a56ae7fea4449 (diff) | |
qtwayland_%.bbappend: Migrate the qt shell integration to the proper
place
The proper place to choose the qtshell integration is with qtwayland so
migrate it there.
While at it, upgrade to xdg-shell stable instead of using the unstable v6.
Bug-AGL: SPEC-3133
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: I67b92cd744c4e34c9a603b9535823d9562d4bdf8
Diffstat (limited to 'meta-app-framework')
| -rw-r--r-- | meta-app-framework/recipes-core/af-main/af-main_git.bb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/meta-app-framework/recipes-core/af-main/af-main_git.bb b/meta-app-framework/recipes-core/af-main/af-main_git.bb index e5a183a31..917eaa414 100644 --- a/meta-app-framework/recipes-core/af-main/af-main_git.bb +++ b/meta-app-framework/recipes-core/af-main/af-main_git.bb @@ -85,9 +85,6 @@ do_install_append_class-target() { ln -sf ../afm-system-daemon.service ${D}${systemd_system_unitdir}/multi-user.target.wants/afm-system-daemon.service ln -sf ../afm-system-daemon.socket ${D}${systemd_system_unitdir}/sockets.target.wants/afm-system-daemon.socket fi - - DEFAULT_WM_SHELL="${@bb.utils.contains('DISTRO_FEATURES', 'agl-compositor', 'xdg-shell-v6', 'ivi-shell', d)}" - echo "QT_WAYLAND_SHELL_INTEGRATION=${DEFAULT_WM_SHELL}" > ${D}${afm_confdir}/unit.env.d/qt-shell } pkg_postinst_ontarget_${PN}() { |