diff options
| author | Andy Nichols <andy.nichols@digia.com> | 2012-11-03 18:56:12 +0100 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@digia.com> | 2013-01-29 10:46:18 +0100 |
| commit | a6d969abf59ff3a9634910f9b9b7cb588eeea7c6 (patch) | |
| tree | b62ca89fe5240214089c0ff43736f48de542c851 /tests/auto/compositor/mockclient.h | |
| parent | 3f8c8e0f5c9828634621238c145c7e62298a66ba (diff) | |
Update tests to build with wayland 1.0.0
We still fail the same compositor tests, and
seg fault at the begining of the client test,
but this is the same behavior as with 0.95
Change-Id: I2c1af65be4239663f99848b1574d9cc88b4a5d97
Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com>
Diffstat (limited to 'tests/auto/compositor/mockclient.h')
| -rw-r--r-- | tests/auto/compositor/mockclient.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/compositor/mockclient.h b/tests/auto/compositor/mockclient.h index 3253c7ed1..fa7c28a81 100644 --- a/tests/auto/compositor/mockclient.h +++ b/tests/auto/compositor/mockclient.h @@ -70,6 +70,7 @@ public: wl_compositor *compositor; wl_output *output; wl_shm *shm; + wl_registry *registry; QRect geometry; @@ -81,8 +82,8 @@ private slots: private: static MockClient *resolve(void *data) { return static_cast<MockClient *>(data); } - - static void handleGlobal(wl_display *display, uint32_t id, const char *interface, uint32_t, void *data); + static const struct wl_registry_listener registryListener; + static void handleGlobal(void *data, struct wl_registry *registry, uint32_t id, const char *interface, uint32_t version); static int sourceUpdate(uint32_t mask, void *data); static void outputGeometryEvent(void *data, |