diff options
| author | Christophe Chapuis <chris.chapuis@gmail.com> | 2019-03-16 11:41:42 +0000 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@qt.io> | 2019-04-03 07:38:40 +0000 |
| commit | d65783c9e1f40e176943b8706bf6bbed8320bcc8 (patch) | |
| tree | e32fd81833020809501c80414debf21dc2060640 /src/compositor/extensions/qwaylandxdgshellv6_p.h | |
| parent | f602191778cce57a67fdeffe5f3cc0e1cd2c7b53 (diff) | |
| download | qtwayland-d65783c9e1f40e176943b8706bf6bbed8320bcc8.tar.gz | |
compositor: fix QWaylandShell private objects inheritance
If the public API has inheritance relationships, this should be
reflected in the private classes too.
Otherwise the d_func will cast to a wrong type, leading to crashes.
Change-Id: Iad2dccad4b63326e6b108a44c708ab51f0784678
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'src/compositor/extensions/qwaylandxdgshellv6_p.h')
| -rw-r--r-- | src/compositor/extensions/qwaylandxdgshellv6_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compositor/extensions/qwaylandxdgshellv6_p.h b/src/compositor/extensions/qwaylandxdgshellv6_p.h index adc25cb7..457bc220 100644 --- a/src/compositor/extensions/qwaylandxdgshellv6_p.h +++ b/src/compositor/extensions/qwaylandxdgshellv6_p.h @@ -38,6 +38,7 @@ #define QWAYLANDXDGSHELLV6_P_H #include <QtWaylandCompositor/private/qwaylandcompositorextension_p.h> +#include <QtWaylandCompositor/private/qwaylandshell_p.h> #include <QtWaylandCompositor/private/qwayland-server-xdg-shell-unstable-v6.h> #include <QtWaylandCompositor/QWaylandXdgShellV6> @@ -71,7 +72,7 @@ struct Q_WAYLAND_COMPOSITOR_EXPORT QWaylandXdgPositionerV6Data { }; class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandXdgShellV6Private - : public QWaylandCompositorExtensionPrivate + : public QWaylandShellPrivate , public QtWaylandServer::zxdg_shell_v6 { Q_DECLARE_PUBLIC(QWaylandXdgShellV6) |