diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-06 03:03:14 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-06 03:03:14 +0200 |
| commit | 8fb8627fffb12ccf25a9b97a4d6f4cfdd83ea714 (patch) | |
| tree | aac5805ed02dec6ba63881b9db8cb4feea36d80b /src/compositor/extensions/qwaylandwlshell_p.h | |
| parent | 7a69fc27a7cb5c5e9c70c1c56e534e6e59b46696 (diff) | |
| parent | d65783c9e1f40e176943b8706bf6bbed8320bcc8 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I16bc2e214dda4c8d6c9fc3568af60068815fc558
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 f8a29bac8..dbf6e794f 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) |