Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: I31f4c29c985301d28d5c8d0501761c7d4fb7fda6

1 files changed, 2 insertions, 1 deletions

diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h
index 678fc3ae9..57f4657bb 100644
--- a/src/client/qwaylandwindow_p.h
+++ b/src/client/qwaylandwindow_p.h
@@ -126,7 +126,6 @@ public:
     using QtWayland::wl_surface::attach;
     void attach(QWaylandBuffer *buffer, int x, int y);
     void attachOffset(QWaylandBuffer *buffer);
-    QWaylandBuffer *attached() const;
     QPoint attachOffset() const;
 
     using QtWayland::wl_surface::damage;
@@ -243,6 +242,8 @@ private:
     bool setWindowStateInternal(Qt::WindowState flags);
     void setGeometry_helper(const QRect &rect);
     void initWindow();
+    bool shouldCreateShellSurface() const;
+    bool shouldCreateSubSurface() const;
     void reset();
 
     void handleMouseEventWithDecoration(QWaylandInputDevice *inputDevice, const QWaylandPointerEvent &e);