diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2018-09-13 09:44:51 +0200 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@qt.io> | 2018-09-13 13:23:49 +0000 |
| commit | f4838a471137075b48dcbf6d7d82236506c9b34c (patch) | |
| tree | ef3238b740885de36317d76eff64f08f3fb56e5c | |
| parent | 1fb9c318f8233781eb80599195f67a75ff2a2e3b (diff) | |
Don't try to use wl_proxy_get_version with libwayland < 1.10
The pregenerated header for xdg-shell was generated using wayland-scanner 1.13
which uses wl_proxy_get_version which was introduced in 1.10.
Change-Id: I19507ff6e543d4b0aa53e0d022d680090c34ab50
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| -rw-r--r-- | src/plugins/shellintegration/xdg-shell-v5/pregenerated/3rdparty/wayland-xdg-shell-unstable-v5-client-protocol_p.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/shellintegration/xdg-shell-v5/pregenerated/3rdparty/wayland-xdg-shell-unstable-v5-client-protocol_p.h b/src/plugins/shellintegration/xdg-shell-v5/pregenerated/3rdparty/wayland-xdg-shell-unstable-v5-client-protocol_p.h index 62b6a7858..46644610b 100644 --- a/src/plugins/shellintegration/xdg-shell-v5/pregenerated/3rdparty/wayland-xdg-shell-unstable-v5-client-protocol_p.h +++ b/src/plugins/shellintegration/xdg-shell-v5/pregenerated/3rdparty/wayland-xdg-shell-unstable-v5-client-protocol_p.h @@ -1,5 +1,6 @@ /* Generated by wayland-scanner 1.13.0 */ // Hand-edited to resolve conflicts with xdg-shell stable +// And make it build with libwayland < 1.10 #ifndef XDG_SHELL_UNSTABLE_V5_CLIENT_PROTOCOL_H #define XDG_SHELL_UNSTABLE_V5_CLIENT_PROTOCOL_H @@ -362,11 +363,13 @@ xdg_shell_get_user_data(struct xdg_shell_v5 *xdg_shell) return wl_proxy_get_user_data((struct wl_proxy *) xdg_shell); } +#if WAYLAND_VERSION_MAJOR > 1 || WAYLAND_VERSION_MINOR >= 10 static inline uint32_t xdg_shell_get_version(struct xdg_shell_v5 *xdg_shell) { return wl_proxy_get_version((struct wl_proxy *) xdg_shell); } +#endif /** * @ingroup iface_xdg_shell @@ -687,11 +690,13 @@ xdg_surface_get_user_data(struct xdg_surface_v5 *xdg_surface) return wl_proxy_get_user_data((struct wl_proxy *) xdg_surface); } +#if WAYLAND_VERSION_MAJOR > 1 || WAYLAND_VERSION_MINOR >= 10 static inline uint32_t xdg_surface_get_version(struct xdg_surface_v5 *xdg_surface) { return wl_proxy_get_version((struct wl_proxy *) xdg_surface); } +#endif /** * @ingroup iface_xdg_surface @@ -1081,11 +1086,13 @@ xdg_popup_get_user_data(struct xdg_popup_v5 *xdg_popup) return wl_proxy_get_user_data((struct wl_proxy *) xdg_popup); } +#if WAYLAND_VERSION_MAJOR > 1 || WAYLAND_VERSION_MINOR >= 10 static inline uint32_t xdg_popup_get_version(struct xdg_popup_v5 *xdg_popup) { return wl_proxy_get_version((struct wl_proxy *) xdg_popup); } +#endif /** * @ingroup iface_xdg_popup |