diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-27 14:30:08 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-09-27 15:10:13 +0200 |
| commit | ef69b4d772304efcc3b9141900f4e76642d4873b (patch) | |
| tree | be32cebe5d78f424fba33808966982312998a277 /src/client/qwaylandscreen.cpp | |
| parent | 064feb4fd76e6adbfcafe449d6ae7f52834c538a (diff) | |
| parent | ffee1b3fb8c8e76d9317547376c8f13b0e17b494 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/client/qwaylandwindow.cpp
src/client/qwaylandwindow_p.h
src/compositor/compositor_api/qwaylandpointer.cpp
Change-Id: Icbc22a1ae3cdd9cde438742817d07fccf97f647b
Diffstat (limited to 'src/client/qwaylandscreen.cpp')
| -rw-r--r-- | src/client/qwaylandscreen.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/client/qwaylandscreen.cpp b/src/client/qwaylandscreen.cpp index 2f90be813..b6336f2e6 100644 --- a/src/client/qwaylandscreen.cpp +++ b/src/client/qwaylandscreen.cpp @@ -185,6 +185,12 @@ QWaylandScreen * QWaylandScreen::waylandScreenFromWindow(QWindow *window) return static_cast<QWaylandScreen *>(platformScreen); } +QWaylandScreen *QWaylandScreen::fromWlOutput(::wl_output *output) +{ + auto wlOutput = static_cast<QtWayland::wl_output *>(wl_output_get_user_data(output)); + return static_cast<QWaylandScreen *>(wlOutput); +} + void QWaylandScreen::output_mode(uint32_t flags, int width, int height, int refresh) { if (!(flags & WL_OUTPUT_MODE_CURRENT)) |