From f94c0f2cb6cb1ffa7a03e93228729802bfb5af93 Mon Sep 17 00:00:00 2001
From: Johan Klokkhammer Helsing <johan.helsing@qt.io>
Date: Fri, 5 Jan 2018 12:44:30 +0100
Subject: [PATCH] Fix protocol error when destroying xdg surfaces (v6)

Destroy role object for toplevels when destroying the xdg surface.

Task-number: QTBUG-65568
Change-Id: Ibe027c3eef8160f9fd2cfb05971c92ceb155f95b
Reviewed-by: David Edmundson <davidedmundson@kde.org>
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
---
 src/plugins/platforms/wayland/qwaylandxdgshellv6.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/plugins/platforms/wayland/qwaylandxdgshellv6.cpp b/src/plugins/platforms/wayland/qwaylandxdgshellv6.cpp
index cd81778c79c..7473174d1bf 100644
--- a/src/plugins/platforms/wayland/qwaylandxdgshellv6.cpp
+++ b/src/plugins/platforms/wayland/qwaylandxdgshellv6.cpp
@@ -125,6 +125,8 @@ QWaylandXdgSurfaceV6::QWaylandXdgSurfaceV6(QWaylandXdgShellV6 *shell, ::zxdg_sur
 
 QWaylandXdgSurfaceV6::~QWaylandXdgSurfaceV6()
 {
+    if (m_toplevel)
+        zxdg_toplevel_v6_destroy(m_toplevel->object());
     if (m_popup)
         zxdg_popup_v6_destroy(m_popup->object());
     destroy();