Skip to content

Commit

Permalink
Restore some symbols in linux_wayland_helper
Browse files Browse the repository at this point in the history
They're used in the upcoming Qt 6.4
  • Loading branch information
ilya-fedin authored and john-preston committed Aug 12, 2022
1 parent 1a24c44 commit 5cf73fe
Showing 1 changed file with 16 additions and 0 deletions.
16 changes: 16 additions & 0 deletions linux_wayland_helper/linux_wayland_helper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,15 @@ int (*wl_display_prepare_read_queue)(
int (*wl_display_flush)(struct wl_display *display);
void (*wl_display_cancel_read)(struct wl_display *display);
int (*wl_display_read_events)(struct wl_display *display);
void (*wl_event_queue_destroy)(struct wl_event_queue *queue);
int (*wl_display_prepare_read)(struct wl_display *display);
int (*wl_display_dispatch_pending)(struct wl_display *display);
struct wl_display *(*wl_display_connect)(const char *name);
void (*wl_display_disconnect)(struct wl_display *display);
void *(*wl_proxy_create_wrapper)(void *proxy);
void (*wl_proxy_wrapper_destroy)(void *proxy_wrapper);
void (*wl_proxy_set_queue)(struct wl_proxy *proxy, struct wl_event_queue *queue);
int (*wl_display_roundtrip)(struct wl_display *display);
struct wl_proxy *(*wl_proxy_marshal_array_constructor)(
struct wl_proxy *proxy,
uint32_t opcode,
Expand Down Expand Up @@ -236,13 +238,15 @@ bool Resolve() {
&& LOAD_SYMBOL(client, wl_display_flush)
&& LOAD_SYMBOL(client, wl_display_cancel_read)
&& LOAD_SYMBOL(client, wl_display_read_events)
&& LOAD_SYMBOL(client, wl_event_queue_destroy)
&& LOAD_SYMBOL(client, wl_display_prepare_read)
&& LOAD_SYMBOL(client, wl_display_dispatch_pending)
&& LOAD_SYMBOL(client, wl_display_connect)
&& LOAD_SYMBOL(client, wl_display_disconnect)
&& LOAD_SYMBOL(client, wl_proxy_create_wrapper)
&& LOAD_SYMBOL(client, wl_proxy_wrapper_destroy)
&& LOAD_SYMBOL(client, wl_proxy_set_queue)
&& LOAD_SYMBOL(client, wl_display_roundtrip)
&& LOAD_SYMBOL(client, wl_proxy_marshal_array_constructor)
&& LOAD_SYMBOL(client, wl_proxy_marshal_array_constructor_versioned)
&& LOAD_SYMBOL(client, wl_proxy_get_id)
Expand Down Expand Up @@ -424,6 +428,12 @@ int wl_display_read_events(struct wl_display *display) {
return W::wl_display_read_events(display);
}

void wl_event_queue_destroy(struct wl_event_queue *queue) {
Expects(W::wl_event_queue_destroy != nullptr);

W::wl_event_queue_destroy(queue);
}

int wl_display_prepare_read(struct wl_display *display) {
Expects(W::wl_display_prepare_read != nullptr);

Expand Down Expand Up @@ -470,6 +480,12 @@ void wl_proxy_set_queue(
W::wl_proxy_set_queue(proxy, queue);
}

int wl_display_roundtrip(struct wl_display *display) {
Expects(W::wl_display_roundtrip != nullptr);

return W::wl_display_roundtrip(display);
}

struct wl_proxy *wl_proxy_marshal_array_constructor(
struct wl_proxy *proxy,
uint32_t opcode,
Expand Down

0 comments on commit 5cf73fe

Please sign in to comment.