From caded7fb858392dc1347fac05bc3f8e0999ef334 Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Thu, 2 Dec 2021 20:21:46 +0200 Subject: [PATCH] Client: Make xdg_output.name required only if it's supported The xdg_output.name property is available only since version 2. Fixes: QTBUG-98010 Pick-to: 6.2 Change-Id: I1051b8e9d99fe27f0170ea202deac9cdad9818ae Reviewed-by: Liang Qi Reviewed-by: David Edmundson --- src/plugins/platforms/wayland/qwaylandscreen.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/platforms/wayland/qwaylandscreen.cpp b/src/plugins/platforms/wayland/qwaylandscreen.cpp index 293e8e800a2..eba74fad3ef 100644 --- a/src/plugins/platforms/wayland/qwaylandscreen.cpp +++ b/src/plugins/platforms/wayland/qwaylandscreen.cpp @@ -87,7 +87,8 @@ uint QWaylandScreen::requiredEvents() const uint ret = OutputDoneEvent; if (mWaylandDisplay->xdgOutputManager()) { - ret |= XdgOutputNameEvent; + if (mWaylandDisplay->xdgOutputManager()->version() >= 2) + ret |= XdgOutputNameEvent; if (mWaylandDisplay->xdgOutputManager()->version() < 3) ret |= XdgOutputDoneEvent;