diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2016-08-26 16:22:11 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2016-08-26 16:23:35 +0200 |
| commit | f21246748ce20cd86346e192fe0c4c76a9b08a7c (patch) | |
| tree | ae980082826dd72ac3d31461365f6a37e7c5265b /src/client/qwaylandwindow_p.h | |
| parent | 54b819679cd39e997cc9319deaf432c37667ae6f (diff) | |
| parent | 93c09bcafbc6f2accd11d34433dc475822ba7712 (diff) | |
Merge remote-tracking branch 'qt/5.6.2' into 5.6
Change-Id: Ie6ec1ae90396619214cf1f29ae9595c5f1915e10
Diffstat (limited to 'src/client/qwaylandwindow_p.h')
| -rw-r--r-- | src/client/qwaylandwindow_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h index c60891d49..d7e795159 100644 --- a/src/client/qwaylandwindow_p.h +++ b/src/client/qwaylandwindow_p.h @@ -136,6 +136,8 @@ public: QWaylandSubSurface *subSurfaceWindow() const; QWaylandScreen *screen() const { return mScreen; } + bool shellManagesActiveState() const; + void handleContentOrientationChange(Qt::ScreenOrientation orientation) Q_DECL_OVERRIDE; void setOrientationMask(Qt::ScreenOrientations mask); |