1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove checks for old Wayland versions

Browse Source 
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 <eskil.abrahamsen-blomfeldt@qt.io>
This commit is contained in:
Paul Olav Tvete 2020-07-03 14:13:25 +02:00
parent 71eb32d328
commit 0143b0dac9
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/tools/qtwaylandscanner/qtwaylandscanner.cpp
View File

@ -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");