3 files changed, 13 insertions, 8 deletions
diff --git a/src/plugins/shellintegration/wl-shell/qwaylandwlshellintegration_p.h b/src/plugins/shellintegration/wl-shell/qwaylandwlshellintegration_p.h
index 80a7507d4..3d76cc310 100644
--- a/src/plugins/shellintegration/wl-shell/qwaylandwlshellintegration_p.h
+++ b/src/plugins/shellintegration/wl-shell/qwaylandwlshellintegration_p.h
@@ -51,7 +51,6 @@
 // We mean it.
 //
 
-#include <wayland-client.h>
 #include <private/qwayland-wayland.h>
 
 #include <QtWaylandClient/private/qwaylandshellintegration_p.h>
diff --git a/src/plugins/shellintegration/wl-shell/qwaylandwlshellsurface.cpp b/src/plugins/shellintegration/wl-shell/qwaylandwlshellsurface.cpp
index 88a63655c..4506c312a 100644
--- a/src/plugins/shellintegration/wl-shell/qwaylandwlshellsurface.cpp
+++ b/src/plugins/shellintegration/wl-shell/qwaylandwlshellsurface.cpp
@@ -76,11 +76,10 @@ QWaylandWlShellSurface::~QWaylandWlShellSurface()
     delete m_extendedWindow;
 }
 
-void QWaylandWlShellSurface::resize(QWaylandInputDevice *inputDevice, enum wl_shell_surface_resize edges)
+void QWaylandWlShellSurface::resize(QWaylandInputDevice *inputDevice, Qt::Edges edges)
 {
-    resize(inputDevice->wl_seat(),
-           inputDevice->serial(),
-           edges);
+    enum resize resizeEdges = convertToResizeEdges(edges);
+    resize(inputDevice->wl_seat(), inputDevice->serial(), resizeEdges);
 }
 
 bool QWaylandWlShellSurface::move(QWaylandInputDevice *inputDevice)
@@ -193,6 +192,14 @@ void QWaylandWlShellSurface::requestWindowStates(Qt::WindowStates states)
     m_pending.states = states & ~Qt::WindowMinimized;
 }
 
+enum QWaylandWlShellSurface::resize QWaylandWlShellSurface::convertToResizeEdges(Qt::Edges edges)
+{
+    return static_cast<enum resize>(
+                ((edges & Qt::TopEdge) ? resize_top : 0)
+                | ((edges & Qt::BottomEdge) ? resize_bottom : 0)
+                | ((edges & Qt::LeftEdge) ? resize_left : 0)
+                | ((edges & Qt::RightEdge) ? resize_right : 0));
+}
 
 void QWaylandWlShellSurface::setTopLevel()
 {
diff --git a/src/plugins/shellintegration/wl-shell/qwaylandwlshellsurface_p.h b/src/plugins/shellintegration/wl-shell/qwaylandwlshellsurface_p.h
index 57e06525a..324c10aac 100644
--- a/src/plugins/shellintegration/wl-shell/qwaylandwlshellsurface_p.h
+++ b/src/plugins/shellintegration/wl-shell/qwaylandwlshellsurface_p.h
@@ -53,8 +53,6 @@
 
 #include <QtCore/QSize>
 
-#include <wayland-client.h>
-
 #include <QtWaylandClient/qtwaylandclientglobal.h>
 #include <QtWaylandClient/private/qwayland-wayland.h>
 #include <QtWaylandClient/private/qwaylandshellsurface_p.h>
@@ -78,7 +76,7 @@ public:
     ~QWaylandWlShellSurface() override;
 
     using QtWayland::wl_shell_surface::resize;
-    void resize(QWaylandInputDevice *inputDevice, enum wl_shell_surface_resize edges) override;
+    void resize(QWaylandInputDevice *inputDevice, Qt::Edges edges) override;
 
     using QtWayland::wl_shell_surface::move;
     bool move(QWaylandInputDevice *inputDevice) override;
@@ -99,6 +97,7 @@ protected:
     void requestWindowStates(Qt::WindowStates states) override;
 
 private:
+    static enum resize convertToResizeEdges(Qt::Edges edges);
     void setTopLevel();
     void updateTransientParent(QWindow *parent);
     void setPopup(QWaylandWindow *parent, QWaylandInputDevice *device, uint serial);