diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2019-06-05 13:21:22 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2019-06-05 13:21:22 +0200 |
| commit | 70d422afb8f631e14140f22b01256013b28b7034 (patch) | |
| tree | 7e2e2155cb976122a6d586a9e6d00c3210ba1f0d /src/compositor/extensions/qwaylandwlshell_p.h | |
| parent | d829ba99c862efbdb6a040627176913a8a1e3847 (diff) | |
| parent | cde2fe3fba31b9b8d258f0663bc34009fd769efd (diff) | |
Merge remote-tracking branch 'qt/5.12' into texturesharing-5.12
Change-Id: Ib8fba00f848821bfab58d33aff74ace436af204a
Diffstat (limited to 'src/compositor/extensions/qwaylandwlshell_p.h')
| -rw-r--r-- | src/compositor/extensions/qwaylandwlshell_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compositor/extensions/qwaylandwlshell_p.h b/src/compositor/extensions/qwaylandwlshell_p.h index e8d568fce..b2beca169 100644 --- a/src/compositor/extensions/qwaylandwlshell_p.h +++ b/src/compositor/extensions/qwaylandwlshell_p.h @@ -43,6 +43,7 @@ #include <QtWaylandCompositor/qtwaylandcompositorglobal.h> #include <QtWaylandCompositor/qwaylandsurface.h> #include <QtWaylandCompositor/private/qwaylandcompositorextension_p.h> +#include <QtWaylandCompositor/private/qwaylandshell_p.h> #include <QtWaylandCompositor/QWaylandWlShellSurface> #include <QtWaylandCompositor/QWaylandSeat> @@ -67,7 +68,7 @@ QT_BEGIN_NAMESPACE class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandWlShellPrivate - : public QWaylandCompositorExtensionPrivate + : public QWaylandShellPrivate , public QtWaylandServer::wl_shell { Q_DECLARE_PUBLIC(QWaylandWlShell) |