diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2021-05-11 13:36:54 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2021-05-25 08:17:32 +0300 |
| commit | c14e8c0d65fe18c7901c0267e119849e7ceee6f4 (patch) | |
| tree | e81636085c22c2be763bf0b1ec032ef8f89e3f68 | |
| parent | 4164822a09c7d8dfcd097c08530a1b776d7ca9f9 (diff) | |
default-qt-envs: add wayland display env for weston
Weston is now running as 'weston' user and using /run/wayland-0 as
the default socket for connecting to the compositor. Make sure that
applications can connect to it by adding environment variable in
the default envs.
Add also QT_QPA_PLATFORM to make eglfs or linuxfb the default platform.
If not added, Qt would default to wayland since it finds WAYLAND_DISPLAY
from the environment.
Change-Id: Ic8581ad0ee486aa27c1c36c2f89aceb76dbcb387
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
| -rw-r--r-- | meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs.bb | 6 | ||||
| -rw-r--r-- | meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs/defaults | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs.bb index 7171c3d4..8778e32e 100644 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs.bb +++ b/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs.bb @@ -38,6 +38,12 @@ SRC_URI += "\ file://b2qt.service \ " +QT_QPA_PLATFORM ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'eglfs', 'linuxfb', d)}" + +do_configure() { + echo "QT_QPA_PLATFORM=${QT_QPA_PLATFORM}" >> ${WORKDIR}/defaults +} + do_install_append() { install -m 0755 -d ${D}${sysconfdir}/default install -m 0755 ${WORKDIR}/defaults ${D}${sysconfdir}/default/qt diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs/defaults b/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs/defaults index b8d2eb64..751210b0 100644 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs/defaults +++ b/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs/defaults @@ -2,3 +2,4 @@ QT_IM_MODULE=qtvirtualkeyboard QTWEBENGINE_DISABLE_SANDBOX=1 XDG_RUNTIME_DIR=/run/user/0 DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/0/dbus_session_socket +WAYLAND_DISPLAY=/run/wayland-0 |