diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2020-06-25 12:12:23 +0000 |
|---|---|---|
| committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2020-06-25 12:12:23 +0000 |
| commit | 7474469f02371f8ec432da13ea3c0fe678568afd (patch) | |
| tree | c13f4491143d2ac30dfca7118d8d7a2fe4d6e7d0 /meta-agl-profile-graphical-qt5/recipes-qt/qt5 | |
| parent | 1e9bc66cdd68be6d6c23c57ccc0928bdbb5cf0a6 (diff) | |
| parent | 54c2fda805fd7fda591008693cd6843413cee9f8 (diff) | |
Merge "Merge the agl-compositor sandbox into master"
Diffstat (limited to 'meta-agl-profile-graphical-qt5/recipes-qt/qt5')
| -rw-r--r-- | meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland_%.bbappend | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland_%.bbappend b/meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland_%.bbappend index 6472c7eff..85ebc29d6 100644 --- a/meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland_%.bbappend +++ b/meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland_%.bbappend @@ -24,12 +24,12 @@ SRC_URI_append = "\ file://0010-Added-manifest-file-according-to-smack-3-domain-mode.patch \ " -DEFAULT_WM_SHELL = "${@bb.utils.contains('DISTRO_FEATURES', 'agl-compositor', 'xdg-shell', 'ivi-shell', d)}" +AGL_DEFAULT_WM_SHELL ?= "xdg-shell" AFM_CONF_DIR = "${D}${sysconfdir}/afm/unit.env.d" QT_SHELL_FILE = "${AFM_CONF_DIR}/qt-shell" do_install_append_class-target() { mkdir -p ${AFM_CONF_DIR} - echo "QT_WAYLAND_SHELL_INTEGRATION=${DEFAULT_WM_SHELL}" > ${QT_SHELL_FILE} + echo "QT_WAYLAND_SHELL_INTEGRATION=${AGL_DEFAULT_WM_SHELL}" > ${QT_SHELL_FILE} echo "QT_WAYLAND_RESIZE_AFTER_SWAP=1" >> ${QT_SHELL_FILE} } |