From f3fde00e041b5a974f49f994ea96b8db729f96cc Mon Sep 17 00:00:00 2001 From: Hannu Lyytinen Date: Wed, 18 Apr 2012 23:14:47 +0300 Subject: Sync up with the latest wayland developments. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit makes the qtwayland module compatible with wayland sha1 677c5180e67be18b7a0867fafb7f205b57a6e9ff. Change-Id: I5af0510034b7e4a038313b80f1f6e0b18fa48eb3 Reviewed-by: Jørgen Lind Reviewed-by: Laszlo Agocs Reviewed-by: Samuel Rødal --- tests/auto/client/mockcompositor.h | 1 + 1 file changed, 1 insertion(+) (limited to 'tests/auto/client/mockcompositor.h') diff --git a/tests/auto/client/mockcompositor.h b/tests/auto/client/mockcompositor.h index 2d1e41836..c47f5f2d1 100644 --- a/tests/auto/client/mockcompositor.h +++ b/tests/auto/client/mockcompositor.h @@ -69,6 +69,7 @@ public: int fileDescriptor() const { return m_fd; } void dispatchEvents(int timeout = 0); + uint32_t nextSerial(); uint32_t time() { return ++m_time; } static void setOutputGeometry(void *compositor, const QList ¶meters); -- cgit v1.2.3