diff options
| author | Giulio Camuffo <giulio.camuffo@kdab.com> | 2016-02-08 19:31:59 +0200 |
|---|---|---|
| committer | Giulio Camuffo <giuliocamuffo@gmail.com> | 2016-02-11 16:22:41 +0000 |
| commit | 19d018dd6c7023dff7f7dcbaa7c38e486897495c (patch) | |
| tree | 13614bfef93e529e73e02e355b7780833ef8cd03 /examples/wayland/qwindow-compositor | |
| parent | b4f3f890475b50fac20c0d542a584dfdab4888a7 (diff) | |
Add surface roles back
Task-number: QTBUG-49809
Change-Id: Id62ddea68c89b6999b66d3df8eeeffd858ae844f
Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
Diffstat (limited to 'examples/wayland/qwindow-compositor')
| -rw-r--r-- | examples/wayland/qwindow-compositor/windowcompositor.cpp | 4 | ||||
| -rw-r--r-- | examples/wayland/qwindow-compositor/windowcompositor.h | 2 |
2 files changed, 3 insertions, 3 deletions
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); |