diff options
| author | Giulio Camuffo <giulio.camuffo@jollamobile.com> | 2014-11-07 14:43:24 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-15 18:46:38 +0100 |
| commit | 4613291e8c1717d8d3316b2c0b1f2c6c96bdc56f (patch) | |
| tree | d815d5dc56c46361146b2ee3ce2b6c2a2cc2c6bb /src/compositor/wayland_wrapper/qwlsurface.cpp | |
| parent | 23ecb57e11bea42c2e90d280b21b6ee448a9afff (diff) | |
| parent | 7882407bb6bab6c042fd20592a63a875b74eb581 (diff) | |
Merge branch '5.4' into dev
Merge done by Giulio Camuffo
Conflicts:
src/client/client.pro
src/client/qwaylanddisplay.cpp
src/client/qwaylandinputdevice.cpp
src/client/qwaylandinputdevice_p.h
src/client/qwaylandwindow.cpp
src/compositor/compositor_api/qwaylandsurface.cpp
src/compositor/compositor_api/qwaylandsurface_p.h
src/compositor/wayland_wrapper/qwlsurface.cpp
Change-Id: I1df878bb54f49d953c51215a2772869e261ebe81
Diffstat (limited to 'src/compositor/wayland_wrapper/qwlsurface.cpp')
| -rw-r--r-- | src/compositor/wayland_wrapper/qwlsurface.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/compositor/wayland_wrapper/qwlsurface.cpp b/src/compositor/wayland_wrapper/qwlsurface.cpp index b494b3e01..ee8197013 100644 --- a/src/compositor/wayland_wrapper/qwlsurface.cpp +++ b/src/compositor/wayland_wrapper/qwlsurface.cpp @@ -109,8 +109,8 @@ static QRegion infiniteRegion() { QPoint(std::numeric_limits<int>::max(), std::numeric_limits<int>::max()))); } -Surface::Surface(struct wl_client *client, uint32_t id, QWaylandCompositor *compositor, QWaylandSurface *surface) - : QtWaylandServer::wl_surface(client, id) +Surface::Surface(struct wl_client *client, uint32_t id, int version, QWaylandCompositor *compositor, QWaylandSurface *surface) + : QtWaylandServer::wl_surface(client, id, version) , m_compositor(compositor->handle()) , m_waylandSurface(surface) , m_buffer(0) @@ -340,8 +340,7 @@ Qt::ScreenOrientation Surface::contentOrientation() const void Surface::surface_destroy_resource(Resource *) { if (m_extendedSurface) { - if (m_extendedSurface->resource()) - wl_resource_destroy(m_extendedSurface->resource()->handle); + m_extendedSurface->setParentSurface(Q_NULLPTR); m_extendedSurface = 0; } |