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

4 files changed, 9 insertions, 9 deletions

diff --git a/tests/auto/client/mockcompositor.cpp b/tests/auto/client/mockcompositor.cpp
index cb0e6576e..665b7dd73 100644
--- a/tests/auto/client/mockcompositor.cpp
+++ b/tests/auto/client/mockcompositor.cpp
@@ -238,7 +238,7 @@ void Compositor::dispatchEvents(int timeout)
 static void compositor_create_surface(wl_client *client, wl_resource *compositorResource, uint32_t id)
 {
     Compositor *compositor = static_cast<Compositor *>(compositorResource->data);
-    compositor->addSurface(new Surface(client, id, compositor));
+    compositor->addSurface(new Surface(client, id, wl_resource_get_version(compositorResource), compositor));
 }
 
 static void compositor_create_region(wl_client *client, wl_resource *compositorResource, uint32_t id)
diff --git a/tests/auto/client/mockinput.cpp b/tests/auto/client/mockinput.cpp
index fbe44de41..754aa4590 100644
--- a/tests/auto/client/mockinput.cpp
+++ b/tests/auto/client/mockinput.cpp
@@ -101,7 +101,7 @@ void Compositor::sendKeyRelease(void *data, const QList<QVariant> &parameters)
 }
 
 Seat::Seat(Compositor *compositor, struct ::wl_display *display)
-    : wl_seat(display)
+    : wl_seat(display, 2)
     , m_compositor(compositor)
     , m_keyboard(new Keyboard(compositor))
     , m_pointer(new Pointer(compositor))
@@ -119,12 +119,12 @@ void Seat::seat_bind_resource(Resource *resource)
 
 void Seat::seat_get_keyboard(Resource *resource, uint32_t id)
 {
-    m_keyboard->add(resource->client(), id);
+    m_keyboard->add(resource->client(), id, resource->version());
 }
 
 void Seat::seat_get_pointer(Resource *resource, uint32_t id)
 {
-    m_pointer->add(resource->client(), id);
+    m_pointer->add(resource->client(), id, resource->version());
 }
 
 Keyboard::Keyboard(Compositor *compositor)
@@ -240,7 +240,7 @@ DataDevice::~DataDevice()
 }
 
 DataDeviceManager::DataDeviceManager(Compositor *compositor, wl_display *display)
-    : wl_data_device_manager(display)
+    : wl_data_device_manager(display, 1)
     , m_compositor(compositor)
 {
 
@@ -255,7 +255,7 @@ void DataDeviceManager::data_device_manager_get_data_device(Resource *resource,
 {
     if (!m_data_device)
         m_data_device.reset(new DataDevice(m_compositor));
-    m_data_device->add(resource->client(), id);
+    m_data_device->add(resource->client(), id, 1);
 }
 
 }
diff --git a/tests/auto/client/mocksurface.cpp b/tests/auto/client/mocksurface.cpp
index 2e4c2bc73..330213bde 100644
--- a/tests/auto/client/mocksurface.cpp
+++ b/tests/auto/client/mocksurface.cpp
@@ -44,8 +44,8 @@
 
 namespace Impl {
 
-Surface::Surface(wl_client *client, uint32_t id, Compositor *compositor)
-    : QtWaylandServer::wl_surface(client, id)
+Surface::Surface(wl_client *client, uint32_t id, int v, Compositor *compositor)
+    : QtWaylandServer::wl_surface(client, id, v)
     , m_buffer(Q_NULLPTR)
     , m_compositor(compositor)
     , m_mockSurface(new MockSurface(this))
diff --git a/tests/auto/client/mocksurface.h b/tests/auto/client/mocksurface.h
index f2a2f4eb3..33ced4385 100644
--- a/tests/auto/client/mocksurface.h
+++ b/tests/auto/client/mocksurface.h
@@ -50,7 +50,7 @@ namespace Impl {
 class Surface : public QtWaylandServer::wl_surface
 {
 public:
-    Surface(wl_client *client, uint32_t id, Compositor *compositor);
+    Surface(wl_client *client, uint32_t id, int v, Compositor *compositor);
     ~Surface();
 
     Compositor *compositor() const { return m_compositor; }