diff options
| author | Vlad Zahorodnii <vlad.zahorodnii@kde.org> | 2021-12-02 20:21:46 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-12-03 07:54:02 +0000 |
| commit | afc730549d69f292d20437a70b52c34cae4481a6 (patch) | |
| tree | ca3fa6ab08f4e6fae021bbd125a51d8bd62e7be8 | |
| parent | 2acb61f7b0920ca9621459804c0c1af833524577 (diff) | |
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
Change-Id: I1051b8e9d99fe27f0170ea202deac9cdad9818ae
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: David Edmundson <davidedmundson@kde.org>
(cherry picked from commit e5a77a6c22710be4bd07919bcc54dcf78659da04)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/client/qwaylandscreen.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/client/qwaylandscreen.cpp b/src/client/qwaylandscreen.cpp index 293e8e800..eba74fad3 100644 --- a/src/client/qwaylandscreen.cpp +++ b/src/client/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; |