From 0143b0dac902638a69b52f317a105e8722cf19c2 Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Fri, 3 Jul 2020 14:13:25 +0200 Subject: [PATCH] Remove checks for old Wayland versions Now that the minimum libwayland version is 1.15, there is no point in checking whether the version is greater than 1.10. Task-number: QTBUG-73636 Change-Id: I75a97bec7e464aa6b04e21d1c23566d17ac7684a Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/tools/qtwaylandscanner/qtwaylandscanner.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/tools/qtwaylandscanner/qtwaylandscanner.cpp b/src/tools/qtwaylandscanner/qtwaylandscanner.cpp index 130a71554c6..f550651b2b5 100644 --- a/src/tools/qtwaylandscanner/qtwaylandscanner.cpp +++ b/src/tools/qtwaylandscanner/qtwaylandscanner.cpp @@ -1105,13 +1105,8 @@ bool Scanner::process() printf("static inline void *wlRegistryBind(struct ::wl_registry *registry, uint32_t name, const struct ::wl_interface *interface, uint32_t version)\n"); printf("{\n"); printf(" const uint32_t bindOpCode = 0;\n"); - printf("#if (WAYLAND_VERSION_MAJOR == 1 && WAYLAND_VERSION_MINOR > 10) || WAYLAND_VERSION_MAJOR > 1\n"); printf(" return (void *) wl_proxy_marshal_constructor_versioned((struct wl_proxy *) registry,\n"); - printf(" bindOpCode, interface, version, name, interface->name, version, nullptr);\n"); - printf("#else\n"); - printf(" return (void *) wl_proxy_marshal_constructor((struct wl_proxy *) registry,\n"); - printf(" bindOpCode, interface, name, interface->name, version, nullptr);\n"); - printf("#endif\n"); + printf(" bindOpCode, interface, version, name, interface->name, version, nullptr);\n"); printf("}\n"); printf("\n");