diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2024-02-07 15:45:25 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-02-08 10:00:36 +0000 |
| commit | b14e24b2f4a2474365b068a6c7a0411688c5fe6b (patch) | |
| tree | dd82cf763b4697df60968cc97db9e4895c2fa686 | |
| parent | a46a05e63bfa33507a00d69535677a01a1ee7e52 (diff) | |
Respect WAYLAND_DISPLAY on compositor
If WAYLAND_DISPLAY environment variable is set, clients connect to it
by default. Use the same env also on compositor when creating the socket.
Change-Id: I7e45437b9662e6591a675922de05fb7b9e324b8e
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
(cherry picked from commit b1ef33c76b554e5c9772bd01f060177198964900)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/compositor/compositor_api/qwaylandcompositor.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp index 28809f1c2..ea7c4a345 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.cpp +++ b/src/compositor/compositor_api/qwaylandcompositor.cpp @@ -166,6 +166,8 @@ void QWaylandCompositorPrivate::init() const int socketArg = arguments.indexOf(QLatin1String("--wayland-socket-name")); if (socketArg != -1 && socketArg + 1 < arguments.size()) socket_name = arguments.at(socketArg + 1).toLocal8Bit(); + if (socket_name.isEmpty()) + socket_name = qgetenv("WAYLAND_DISPLAY"); } wl_compositor::init(display, 4); wl_subcompositor::init(display, 1); |