diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-20 11:38:52 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-09-20 11:38:52 +0200 |
| commit | 20ebb685e0fef048e56ed19403575634ce4b3435 (patch) | |
| tree | 6ad6fedfbe4d361e40a0307f1f0cdc39044b53b6 /src/client/qwaylandscreen_p.h | |
| parent | e1f89e15cf00420bd77ac16a867a1cadc9b942fc (diff) | |
| parent | 3cb09edd71745edda4bbe8de3a6d7ad8e4ea5f58 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I76bfc271efcf75c75bf38f4bf58503e1d2a00839
Diffstat (limited to 'src/client/qwaylandscreen_p.h')
| -rw-r--r-- | src/client/qwaylandscreen_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/client/qwaylandscreen_p.h b/src/client/qwaylandscreen_p.h index 526c94878..674e1a913 100644 --- a/src/client/qwaylandscreen_p.h +++ b/src/client/qwaylandscreen_p.h @@ -102,6 +102,7 @@ public: ::wl_output *output() { return object(); } static QWaylandScreen *waylandScreenFromWindow(QWindow *window); + static QWaylandScreen *fromWlOutput(::wl_output *output); private: void output_mode(uint32_t flags, int width, int height, int refresh) override; |