summaryrefslogtreecommitdiffstats
path: root/src/client/qwaylandwindow.cpp
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@qt.io>2016-08-26 16:22:11 +0200
committerPaul Olav Tvete <paul.tvete@qt.io>2016-08-26 16:23:35 +0200
commitf21246748ce20cd86346e192fe0c4c76a9b08a7c (patch)
treeae980082826dd72ac3d31461365f6a37e7c5265b /src/client/qwaylandwindow.cpp
parent54b819679cd39e997cc9319deaf432c37667ae6f (diff)
parent93c09bcafbc6f2accd11d34433dc475822ba7712 (diff)
Merge remote-tracking branch 'qt/5.6.2' into 5.6
Diffstat (limited to 'src/client/qwaylandwindow.cpp')
-rw-r--r--src/client/qwaylandwindow.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
index aba676533..8885c0e5d 100644
--- a/src/client/qwaylandwindow.cpp
+++ b/src/client/qwaylandwindow.cpp
@@ -500,6 +500,11 @@ QWaylandSubSurface *QWaylandWindow::subSurfaceWindow() const
return mSubSurfaceWindow;
}
+bool QWaylandWindow::shellManagesActiveState() const
+{
+ return mShellSurface && mShellSurface->shellManagesActiveState();
+}
+
void QWaylandWindow::handleContentOrientationChange(Qt::ScreenOrientation orientation)
{
if (mDisplay->compositorVersion() < 2)