summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2018-09-14 15:20:03 +0200
committerJohan Helsing <johan.helsing@qt.io>2018-09-17 08:20:31 +0000
commited38c063a84cca244c1528ecddb956abdc8018a8 (patch)
tree806f074b250a5402e7d0a2955c1253171b9432b5 /tests
parente3cb1c4e82b1172c7775ea0c8780f4b4e8fb94da (diff)
Remove ifdefs for unsupported libwayland versions
The ifdefs were for version 1.2.0. Change-Id: Ie58745c7cf4c0fba45bc5203d24e9913d3a8b8ce Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/client/shared/mocksurface.cpp7
1 files changed, 0 insertions, 7 deletions
diff --git a/tests/auto/client/shared/mocksurface.cpp b/tests/auto/client/shared/mocksurface.cpp
index 4de4265d7..c0d51618c 100644
--- a/tests/auto/client/shared/mocksurface.cpp
+++ b/tests/auto/client/shared/mocksurface.cpp
@@ -161,14 +161,7 @@ void Surface::surface_commit(Resource *resource)
Q_UNUSED(resource);
if (m_buffer) {
-#if WAYLAND_VERSION_CHECK(1, 2, 0)
struct ::wl_shm_buffer *shm_buffer = wl_shm_buffer_get(m_buffer);
-#else
- struct ::wl_buffer *shm_buffer = 0;
- if (wl_buffer_is_shm(static_cast<struct ::wl_buffer*>(m_buffer->data)))
- shm_buffer = static_cast<struct ::wl_buffer*>(m_buffer->data);
-#endif
-
if (shm_buffer) {
int stride = wl_shm_buffer_get_stride(shm_buffer);
uint format = wl_shm_buffer_get_format(shm_buffer);