diff options
author | Paul Olav Tvete <paul.tvete@qt.io> | 2017-03-01 15:47:21 +0100 |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@qt.io> | 2017-03-01 15:48:39 +0100 |
commit | a259232f3a661b8916497b056cb3d50c396c3d94 (patch) | |
tree | 0e73cb46bc78ece0db7e02cd5323018def74e09b /src/client/qwaylandwindow_p.h | |
parent | 852610be9406a46997b5e22e0988e840e8673bf0 (diff) | |
parent | 7d527c1914710a511c06713bbda1572b767cea34 (diff) |
Merge remote-tracking branch 'qt/5.8' into 5.9
Change-Id: I43cd0147a63b5523e3112f09bbfe60e1d6636e6c
Diffstat (limited to 'src/client/qwaylandwindow_p.h')
-rw-r--r-- | src/client/qwaylandwindow_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h index e67cf0afe..8e72b1076 100644 --- a/src/client/qwaylandwindow_p.h +++ b/src/client/qwaylandwindow_p.h @@ -248,6 +248,7 @@ private: bool setWindowStateInternal(Qt::WindowState flags); void setGeometry_helper(const QRect &rect); void initWindow(); + void initializeWlSurface(); bool shouldCreateShellSurface() const; bool shouldCreateSubSurface() const; void reset(); |