diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-18 03:00:45 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-18 03:00:45 +0200 |
| commit | c37b1082f9402c0655dcf71df2083739823e01b1 (patch) | |
| tree | ec28ee997ac38d6f777b97d4472abe176176b0c8 /src/client | |
| parent | 8be3eb7f2881b639b8f6b924908f3e11c0cbe0b7 (diff) | |
| parent | ae4326db18b99630766e73c2f873eb883db2f493 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I27420ad626a0c6a18b9a11c6ffdc102006fe78e0
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/qwaylanddisplay_p.h | 5 | ||||
| -rw-r--r-- | src/client/qwaylandwindow.cpp | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/client/qwaylanddisplay_p.h b/src/client/qwaylanddisplay_p.h index 71a39dd92..0dd8d7aff 100644 --- a/src/client/qwaylanddisplay_p.h +++ b/src/client/qwaylanddisplay_p.h @@ -235,11 +235,6 @@ private: void registry_global(uint32_t id, const QString &interface, uint32_t version) override; void registry_global_remove(uint32_t id) override; - - static void shellHandleConfigure(void *data, struct wl_shell *shell, - uint32_t time, uint32_t edges, - struct wl_surface *surface, - int32_t width, int32_t height); }; } diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp index e58e87221..cc69fac95 100644 --- a/src/client/qwaylandwindow.cpp +++ b/src/client/qwaylandwindow.cpp @@ -67,7 +67,7 @@ #include <QtCore/QDebug> -#include <wayland-client-core.h> +#include <wayland-client.h> QT_BEGIN_NAMESPACE |