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/compositor_api/qwaylandsurface.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/compositor_api/qwaylandsurface.cpp')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandsurface.cpp | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/compositor/compositor_api/qwaylandsurface.cpp b/src/compositor/compositor_api/qwaylandsurface.cpp index 9e1ffc546..b5c38d88e 100644 --- a/src/compositor/compositor_api/qwaylandsurface.cpp +++ b/src/compositor/compositor_api/qwaylandsurface.cpp @@ -63,8 +63,8 @@ QT_BEGIN_NAMESPACE -QWaylandSurfacePrivate::QWaylandSurfacePrivate(wl_client *wlClient, quint32 id, QWaylandCompositor *compositor, QWaylandSurface *surface) - : QtWayland::Surface(wlClient, id, compositor, surface) +QWaylandSurfacePrivate::QWaylandSurfacePrivate(wl_client *wlClient, quint32 id, int version, QWaylandCompositor *compositor, QWaylandSurface *surface) + : QtWayland::Surface(wlClient, id, version, compositor, surface) , closing(false) , refCount(1) , client(QWaylandClient::fromWlClient(wlClient)) @@ -73,8 +73,8 @@ QWaylandSurfacePrivate::QWaylandSurfacePrivate(wl_client *wlClient, quint32 id, -QWaylandSurface::QWaylandSurface(wl_client *client, quint32 id, QWaylandCompositor *compositor) - : QObject(*new QWaylandSurfacePrivate(client, id, compositor, this)) +QWaylandSurface::QWaylandSurface(wl_client *client, quint32 id, int version, QWaylandCompositor *compositor) + : QObject(*new QWaylandSurfacePrivate(client, id, version, compositor, this)) { } @@ -330,14 +330,7 @@ void QWaylandSurface::destroySurface() { QWaylandSurfaceOp op(QWaylandSurfaceOp::Close); if (!sendInterfaceOp(op)) - destroySurfaceByForce(); -} - -void QWaylandSurface::destroySurfaceByForce() -{ - Q_D(QWaylandSurface); - wl_resource *surface_resource = d->resource()->handle; - wl_resource_destroy(surface_resource); + emit surfaceDestroyed(); } /*! |