diff --git a/src/tools/qtwaylandscanner/qtwaylandscanner.cpp b/src/tools/qtwaylandscanner/qtwaylandscanner.cpp index c08c00f4fc3..ec1341e8ac1 100644 --- a/src/tools/qtwaylandscanner/qtwaylandscanner.cpp +++ b/src/tools/qtwaylandscanner/qtwaylandscanner.cpp @@ -772,9 +772,6 @@ bool Scanner::process() printf(" that->m_resource_map.remove(resource->client(), resource);\n"); printf(" that->%s_destroy_resource(resource);\n", interfaceNameStripped); printf(" delete resource;\n"); - printf("#if !WAYLAND_VERSION_CHECK(1, 2, 0)\n"); - printf(" free(client_resource);\n"); - printf("#endif\n"); printf(" }\n"); printf("\n"); diff --git a/tests/auto/wayland/shared/mocksurface.cpp b/tests/auto/wayland/shared/mocksurface.cpp index 4de4265d773..c0d51618c7d 100644 --- a/tests/auto/wayland/shared/mocksurface.cpp +++ b/tests/auto/wayland/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(m_buffer->data))) - shm_buffer = static_cast(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);