diff options
author | Giulio Camuffo <giulio.camuffo@jollamobile.com> | 2014-09-30 17:09:49 +0300 |
---|---|---|
committer | Giulio Camuffo <giulio.camuffo@jollamobile.com> | 2014-10-09 09:40:10 +0200 |
commit | bbd4a8f85b2e0ddaa94458569b8b5aa4128c52b1 (patch) | |
tree | 4649a8df94b875073245d1487b23b8ad48a12a57 /src/hardwareintegration/compositor/xcomposite_share | |
parent | 090a39558d99115698e34d61a8d914da4a0637bd (diff) | |
download | qtwayland-bbd4a8f85b2e0ddaa94458569b8b5aa4128c52b1.tar.gz |
Fix the compositor's wayland versioning
We cannot just assume all clients implement the same version of the
various interfaces as the compositor does. Keep track of them, and
react accordingly when creating a resource or sending an event.
Change-Id: I9792433a14d49c5c4df0c892fc1349ce0dfb0d43
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
Diffstat (limited to 'src/hardwareintegration/compositor/xcomposite_share')
-rw-r--r-- | src/hardwareintegration/compositor/xcomposite_share/xcompositebuffer.cpp | 2 | ||||
-rw-r--r-- | src/hardwareintegration/compositor/xcomposite_share/xcompositehandler.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/hardwareintegration/compositor/xcomposite_share/xcompositebuffer.cpp b/src/hardwareintegration/compositor/xcomposite_share/xcompositebuffer.cpp index 0457214b..09789d86 100644 --- a/src/hardwareintegration/compositor/xcomposite_share/xcompositebuffer.cpp +++ b/src/hardwareintegration/compositor/xcomposite_share/xcompositebuffer.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE XCompositeBuffer::XCompositeBuffer(Window window, const QSize &size, struct ::wl_client *client, uint32_t id) - : QtWaylandServer::wl_buffer(client, id) + : QtWaylandServer::wl_buffer(client, id, 1) , mWindow(window) , mInvertedY(false) , mSize(size) diff --git a/src/hardwareintegration/compositor/xcomposite_share/xcompositehandler.cpp b/src/hardwareintegration/compositor/xcomposite_share/xcompositehandler.cpp index 0f10d38d..5e002377 100644 --- a/src/hardwareintegration/compositor/xcomposite_share/xcompositehandler.cpp +++ b/src/hardwareintegration/compositor/xcomposite_share/xcompositehandler.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE XCompositeHandler::XCompositeHandler(QtWayland::Compositor *compositor, Display *display) - : QtWaylandServer::qt_xcomposite(compositor->wl_display()) + : QtWaylandServer::qt_xcomposite(compositor->wl_display(), 1) { compositor->window()->create(); |