diff options
| author | Hannu Lyytinen <hannu.lyytinen@nomovok.com> | 2012-04-18 23:14:47 +0300 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2012-04-19 09:10:18 +0200 |
| commit | f3fde00e041b5a974f49f994ea96b8db729f96cc (patch) | |
| tree | 8248007ab3f1c5ff5d206ffa232541d826859d41 /tests/auto/client/mockcompositor.h | |
| parent | f83a56dcb4b0a81a51e56bb516cb98de75fc6ae5 (diff) | |
Sync up with the latest wayland developments.
This commit makes the qtwayland module compatible with
wayland sha1 677c5180e67be18b7a0867fafb7f205b57a6e9ff.
Change-Id: I5af0510034b7e4a038313b80f1f6e0b18fa48eb3
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'tests/auto/client/mockcompositor.h')
| -rw-r--r-- | tests/auto/client/mockcompositor.h | 1 |
1 files changed, 1 insertions, 0 deletions
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<QVariant> ¶meters); |