1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Client: Make xdg_output.name required only if it's supported

Browse Source 
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 <liang.qi@qt.io>
Reviewed-by: David Edmundson <davidedmundson@kde.org>
This commit is contained in:
Vlad Zahorodnii 2021-12-02 20:21:46 +02:00 committed by Liang Qi
parent 06f069bed8
commit caded7fb85
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/platforms/wayland/qwaylandscreen.cpp
View File

@ -87,7 +87,8 @@ uint QWaylandScreen::requiredEvents() const
uint ret = OutputDoneEvent; uint ret = OutputDoneEvent;
if (mWaylandDisplay->xdgOutputManager()) { if (mWaylandDisplay->xdgOutputManager()) {
ret |= XdgOutputNameEvent; if (mWaylandDisplay->xdgOutputManager()->version() >= 2)
ret |= XdgOutputNameEvent;
if (mWaylandDisplay->xdgOutputManager()->version() < 3) if (mWaylandDisplay->xdgOutputManager()->version() < 3)
ret |= XdgOutputDoneEvent; ret |= XdgOutputDoneEvent;