Add surface roles back

Task-number: QTBUG-49809
Change-Id: Id62ddea68c89b6999b66d3df8eeeffd858ae844f
Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>

5 files changed, 6 insertions, 6 deletions

diff --git a/examples/wayland/custom-extension/compositor/qml/main.qml b/examples/wayland/custom-extension/compositor/qml/main.qml
index 88871de8d..737c42c62 100644
--- a/examples/wayland/custom-extension/compositor/qml/main.qml
+++ b/examples/wayland/custom-extension/compositor/qml/main.qml
@@ -80,7 +80,7 @@ WaylandCompositor {
 
             onCreateShellSurface: {
                 var item = chromeComponent.createObject(defaultOutput.surfaceArea, { "surface": surface } );
-                item.shellSurface.initialize(defaultShell, surface, client, id);
+                item.shellSurface.initialize(defaultShell, surface, resource);
                 lastItem = item;
             }
 
diff --git a/examples/wayland/multi-output/qml/main.qml b/examples/wayland/multi-output/qml/main.qml
index 9fd29fc29..a6a7f8a8d 100644
--- a/examples/wayland/multi-output/qml/main.qml
+++ b/examples/wayland/multi-output/qml/main.qml
@@ -87,7 +87,7 @@ WaylandCompositor {
 
             onCreateShellSurface: {
                 var item = chromeComponent.createObject(defaultOutput.surfaceArea, { "surface": surface } );
-                item.shellSurface.initialize(defaultShell, surface, client, id);
+                item.shellSurface.initialize(defaultShell, surface, resource);
                 surface.activated.connect(item.raise);
             }
 
diff --git a/examples/wayland/pure-qml/qml/main.qml b/examples/wayland/pure-qml/qml/main.qml
index 0a72f7dd5..338c00f80 100644
--- a/examples/wayland/pure-qml/qml/main.qml
+++ b/examples/wayland/pure-qml/qml/main.qml
@@ -69,7 +69,7 @@ WaylandCompositor {
 
             onCreateShellSurface: {
                 var item = chromeComponent.createObject(defaultOutput.surfaceArea, { "surface": surface } );
-                item.shellSurface.initialize(defaultShell, surface, client, id);
+                item.shellSurface.initialize(defaultShell, surface, resource);
             }
 
             Component.onCompleted: {
diff --git a/examples/wayland/qwindow-compositor/windowcompositor.cpp b/examples/wayland/qwindow-compositor/windowcompositor.cpp
index 57d6b382f..f592c64cd 100644
--- a/examples/wayland/qwindow-compositor/windowcompositor.cpp
+++ b/examples/wayland/qwindow-compositor/windowcompositor.cpp
@@ -146,11 +146,11 @@ WindowCompositorView * WindowCompositor::findView(const QWaylandSurface *s) cons
     return Q_NULLPTR;
 }
 
-void WindowCompositor::onCreateShellSurface(QWaylandSurface *s, QWaylandClient *client, uint id)
+void WindowCompositor::onCreateShellSurface(QWaylandSurface *s, const QWaylandResource &res)
 {
     QWaylandSurface *surface = s;
 
-    QWaylandShellSurface *shellSurface = new QWaylandShellSurface(m_shell, surface, client, id);
+    QWaylandShellSurface *shellSurface = new QWaylandShellSurface(m_shell, surface, res);
     connect(shellSurface, &QWaylandShellSurface::startMove, this, &WindowCompositor::onStartMove);
     connect(shellSurface, &QWaylandShellSurface::startResize, this, &WindowCompositor::onStartResize);
     connect(shellSurface, &QWaylandShellSurface::setTransient, this, &WindowCompositor::onSetTransient);
diff --git a/examples/wayland/qwindow-compositor/windowcompositor.h b/examples/wayland/qwindow-compositor/windowcompositor.h
index 7a4f90aad..5eac05c50 100644
--- a/examples/wayland/qwindow-compositor/windowcompositor.h
+++ b/examples/wayland/qwindow-compositor/windowcompositor.h
@@ -115,7 +115,7 @@ private slots:
     void triggerRender();
 
     void onSurfaceCreated(QWaylandSurface *surface);
-    void onCreateShellSurface(QWaylandSurface *s, QWaylandClient *client, uint id);
+    void onCreateShellSurface(QWaylandSurface *s, const QWaylandResource &resource);
     void onSetTransient(QWaylandSurface *parentSurface, const QPoint &relativeToParent, QWaylandShellSurface::FocusPolicy focusPolicy);
     void onSetPopup(QWaylandInputDevice *inputDevice, QWaylandSurface *parent, const QPoint &relativeToParent);