Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
	src/compositor/wayland_wrapper/qwlcompositor.cpp

Change-Id: Ica26e33eb2b77ed5be0e84e8f4256d2e85abfaf5

1 files changed, 4 insertions, 2 deletions

diff --git a/src/client/qwaylanddisplay_p.h b/src/client/qwaylanddisplay_p.h
index ade8475e7..05bd7f15a 100644
--- a/src/client/qwaylanddisplay_p.h
+++ b/src/client/qwaylanddisplay_p.h
@@ -97,7 +97,7 @@ public:
     QWaylandDisplay(QWaylandIntegration *waylandIntegration);
     ~QWaylandDisplay(void);
 
-    QList<QPlatformScreen *> screens() const { return mScreens; }
+    QList<QWaylandScreen *> screens() const { return mScreens; }
 
     QWaylandScreen *screenForOutput(struct wl_output *output) const;
 
@@ -157,6 +157,8 @@ public:
 
     void forceRoundTrip();
 
+    bool supportsWindowDecoration() const;
+
 public slots:
     void blockingReadEvents();
     void flushRequests();
@@ -177,7 +179,7 @@ private:
     QWaylandEventThread *mEventThreadObject;
     QScopedPointer<QtWayland::wl_shell> mShell;
     QScopedPointer<QWaylandXdgShell> mShellXdg;
-    QList<QPlatformScreen *> mScreens;
+    QList<QWaylandScreen *> mScreens;
     QList<QWaylandInputDevice *> mInputDevices;
     QList<Listener> mRegistryListeners;
     QWaylandIntegration *mWaylandIntegration;