diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-01 11:03:33 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-01 11:03:38 +0200 |
| commit | 6260c4376e598031e467416027703bd11012621d (patch) | |
| tree | 993f83d4105f228f4cb6bed1da600dc671be2ed4 /src/client/qwaylandxdgsurface_p.h | |
| parent | 45d43ca1d9c4edca378f21530f184433cc629431 (diff) | |
| parent | d8b4bef3ddff327598027c8f94a61e3d0b61a2dd (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I75a8ddc0652f3c6f438ef98e940c9357450d29c6
Diffstat (limited to 'src/client/qwaylandxdgsurface_p.h')
| -rw-r--r-- | src/client/qwaylandxdgsurface_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/client/qwaylandxdgsurface_p.h b/src/client/qwaylandxdgsurface_p.h index 24eb86519..e98aa41e9 100644 --- a/src/client/qwaylandxdgsurface_p.h +++ b/src/client/qwaylandxdgsurface_p.h @@ -112,6 +112,7 @@ private: bool m_maximized; bool m_minimized; bool m_fullscreen; + bool m_active; QSize m_normalSize; QMargins m_margins; QWaylandExtendedSurface *m_extendedWindow; |