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

Conflicts:
	src/client/qwaylanddisplay_p.h

Change-Id: I602b90a055d1322af369fb7b77a68583154b660f

1 files changed, 10 insertions, 0 deletions

diff --git a/src/client/qwaylandnativeinterface.cpp b/src/client/qwaylandnativeinterface.cpp
index 050099f8b..7df31bbc5 100644
--- a/src/client/qwaylandnativeinterface.cpp
+++ b/src/client/qwaylandnativeinterface.cpp
@@ -40,6 +40,7 @@
 #include "qwaylanddisplay_p.h"
 #include "qwaylandwindowmanagerintegration_p.h"
 #include "qwaylandscreen_p.h"
+#include "qwaylandwlshellsurface_p.h"
 #include <QtGui/private/qguiapplication_p.h>
 #include <QtGui/QScreen>
 #include <QtWaylandClient/private/qwaylandclientbufferintegration_p.h>
@@ -83,6 +84,15 @@ void *QWaylandNativeInterface::nativeResourceForWindow(const QByteArray &resourc
     if (lowerCaseResource == "surface") {
         return ((QWaylandWindow *) window->handle())->object();
     }
+    if (lowerCaseResource == "wl_shell_surface") {
+        QWaylandWindow *w = (QWaylandWindow *) window->handle();
+        if (!w)
+            return NULL;
+        QWaylandWlShellSurface *s = qobject_cast<QWaylandWlShellSurface *>(w->shellSurface());
+        if (!s)
+            return NULL;
+        return s->object();
+    }
     if (lowerCaseResource == "egldisplay" && m_integration->clientBufferIntegration())
         return m_integration->clientBufferIntegration()->nativeResource(QWaylandClientBufferIntegration::EglDisplay);