Update Wayland sha
authorJørgen Lind <jorgen.lind@nokia.com>
Tue, 17 Jan 2012 09:46:56 +0000 (10:46 +0100)
committerLaszlo Agocs <laszlo.p.agocs@nokia.com>
Tue, 17 Jan 2012 14:43:04 +0000 (15:43 +0100)
Change-Id: Ic248b08863e661259ad5f96c35b1135d9de594f8
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
src/plugins/platforms/wayland/qwaylandshmbackingstore.cpp
wayland_sha1.txt

index 4eef507..223ec78 100644 (file)
@@ -80,7 +80,7 @@ QWaylandShmBuffer::QWaylandShmBuffer(QWaylandDisplay *display,
 
     mImage = QImage(data, size.width(), size.height(), stride, format);
     mBuffer = wl_shm_create_buffer(display->shm(),fd, size.width(), size.height(),
-                                       stride, WL_SHM_FORMAT_PREMULTIPLIED_ARGB32);
+                                       stride, WL_SHM_FORMAT_ARGB8888);
     close(fd);
 }
 
index 4b6c19a..437fcf2 100644 (file)
@@ -1,3 +1,3 @@
 This version of Qt-Compositor is checked against the following sha1 from the
 Wayland repository:
-b2e619c7409a98936233b5f8afb8797f5ac457e9
+4b5871e2b8be59b5dc3daa6fe00eb1bee80bfad6