Update Wayland SHA

Change-Id: I3a0adb4b935282b9bb421a87dc8241d6ea8271f0
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>

diff --git a/src/compositor/wayland_wrapper/wloutput.cpp b/src/compositor/wayland_wrapper/wloutput.cpp
index e00d8b8..9ea1c73 100644 (file)
--- a/src/compositor/wayland_wrapper/wloutput.cpp
+++ b/src/compositor/wayland_wrapper/wloutput.cpp
@@ -95,7 +95,7 @@ Output::Output(OutputGlobal *outputGlobal, wl_client *client, uint32_t version,
     Q_UNUSED(version);
     m_output_resource = wl_client_add_object(client,&wl_output_interface,0,id,this);
     wl_output_send_geometry(m_output_resource, 0, 0,
-                         m_output_global->size().width(), m_output_global->size().height(),0,"","");
+                         m_output_global->size().width(), m_output_global->size().height(),0,"","",0);
 
     wl_output_send_mode(m_output_resource, WL_OUTPUT_MODE_CURRENT|WL_OUTPUT_MODE_PREFERRED,
                         m_output_global->size().width(), m_output_global->size().height(), m_output_global->refreshRate());

diff --git a/src/plugins/platforms/wayland/qwaylanddisplay.cpp b/src/plugins/platforms/wayland/qwaylanddisplay.cpp
index 4d0d680..aa233f2 100644 (file)
--- a/src/plugins/platforms/wayland/qwaylanddisplay.cpp
+++ b/src/plugins/platforms/wayland/qwaylanddisplay.cpp
@@ -223,11 +223,13 @@ void QWaylandDisplay::outputHandleGeometry(void *data,
                                            int32_t physicalWidth,
                                            int32_t physicalHeight,
                                            int subpixel,
-                                           const char *make, const char *model)
+                                           const char *make, const char *model,
+                                           int32_t transform)
 {
     Q_UNUSED(subpixel);
     Q_UNUSED(make);
     Q_UNUSED(model);
+    Q_UNUSED(transform);
     QWaylandDisplay *waylandDisplay = static_cast<QWaylandDisplay *>(data);
     QRect outputRect = QRect(x, y, physicalWidth, physicalHeight);
     waylandDisplay->createNewScreen(output,outputRect);

diff --git a/src/plugins/platforms/wayland/qwaylanddisplay.h b/src/plugins/platforms/wayland/qwaylanddisplay.h
index a24b907..08b99d4 100644 (file)
--- a/src/plugins/platforms/wayland/qwaylanddisplay.h
+++ b/src/plugins/platforms/wayland/qwaylanddisplay.h
@@ -152,7 +152,8 @@ private:
                                      int32_t width, int32_t height,
                                      int subpixel,
                                      const char *make,
-                                     const char *model);
+                                     const char *model,
+                                     int32_t transform);
     static void mode(void *data,
                      struct wl_output *wl_output,
                      uint32_t flags,

diff --git a/tests/auto/client/mockoutput.cpp b/tests/auto/client/mockoutput.cpp
index 8066c21..6211e15 100644 (file)
--- a/tests/auto/client/mockoutput.cpp
+++ b/tests/auto/client/mockoutput.cpp
@@ -59,7 +59,7 @@ void Compositor::bindOutput(wl_client *client, void *compositorData, uint32_t ve
 void Compositor::sendOutputGeometry(wl_resource *resource)
 {
     const QRect &r = m_outputGeometry;
-    wl_output_send_geometry(resource, r.x(), r.y(), r.width(), r.height(), 0, "", "");
+    wl_output_send_geometry(resource, r.x(), r.y(), r.width(), r.height(), 0, "", "",0);
 }
 
 void Compositor::sendOutputMode(wl_resource *resource)

diff --git a/tests/auto/compositor/mockclient.cpp b/tests/auto/compositor/mockclient.cpp
index 4b04164..823e9ab 100644 (file)
--- a/tests/auto/compositor/mockclient.cpp
+++ b/tests/auto/compositor/mockclient.cpp
@@ -99,7 +99,8 @@ void MockClient::handleGlobal(wl_display *, uint32_t id, const char *interface,
 void MockClient::outputGeometryEvent(void *data, wl_output *,
                                      int32_t x, int32_t y,
                                      int32_t width, int32_t height,
-                                     int, const char *, const char *)
+                                     int, const char *, const char *,
+                                     int32_t )
 {
     resolve(data)->geometry = QRect(x, y, width, height);
 }

diff --git a/tests/auto/compositor/mockclient.h b/tests/auto/compositor/mockclient.h
index 456f7c3..ae73596 100644 (file)
--- a/tests/auto/compositor/mockclient.h
+++ b/tests/auto/compositor/mockclient.h
@@ -91,7 +91,8 @@ private:
                                     int32_t width, int32_t height,
                                     int subpixel,
                                     const char *make,
-                                    const char *model);
+                                    const char *model,
+                                    int32_t transform);
 
     static void outputModeEvent(void *data,
                                 wl_output *wl_output,

diff --git a/wayland_sha1.txt b/wayland_sha1.txt
index 5198b73..c0ffe12 100644 (file)
--- a/wayland_sha1.txt
+++ b/wayland_sha1.txt
@@ -1,3 +1,3 @@
 This version of Qt-Compositor is checked against the following sha1 from the
 Wayland repository:
-8a023688c07fe2d377c4bc9631ce2fe7a9afee60
+c855d6eec4c5e63489da5bc08451a2376e6d2aea