diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2019-08-23 09:55:56 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2019-08-23 09:57:20 +0200 |
| commit | 13ca5859d3e4a3e22532978dc1bd8629d9aa2107 (patch) | |
| tree | ea3c8b66fd6f6b6e040d5d1de6a14bb6a230eb53 /src/client/qwaylandwindow_p.h | |
| parent | 5d43a686fc3d5f13087a61e8ef216ecbbae0d15e (diff) | |
| parent | f5a28afe4c2cb82540c94616e7a9e3e72e0e8327 (diff) | |
Merge remote-tracking branch 'qt/5.12' into 5.12.5
Conflicts:
src/client/qwaylandwindow.cpp
Change-Id: I89fefe5bfc247eeaad3981850efa0faaab3cb145
Diffstat (limited to 'src/client/qwaylandwindow_p.h')
| -rw-r--r-- | src/client/qwaylandwindow_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h index ed4061f0e..717709938 100644 --- a/src/client/qwaylandwindow_p.h +++ b/src/client/qwaylandwindow_p.h @@ -201,6 +201,10 @@ public: public slots: void applyConfigure(); +signals: + void wlSurfaceCreated(); + void wlSurfaceDestroyed(); + protected: void surface_enter(struct ::wl_output *output) override; void surface_leave(struct ::wl_output *output) override; |