diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 09:19:39 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 09:33:45 +0200 |
| commit | d7b198605de9979b7875c2da20dea5e4657deb17 (patch) | |
| tree | 7374f5b42572027f09c54e08b32ee3aac0bed4b8 /src/client/qwaylandxdgsurface_p.h | |
| parent | e4a4a6dd7503f069efbae81c0587f6d8fe3cee99 (diff) | |
| parent | d5e7965a87d81e2d7157c785403b0aba681de62a (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
src/client/qwaylandshmbackingstore.cpp
src/client/qwaylandwindow.cpp
Change-Id: I795fd08f0fc5d3cb5ed55bf16e724f66b7567723
Diffstat (limited to 'src/client/qwaylandxdgsurface_p.h')
| -rw-r--r-- | src/client/qwaylandxdgsurface_p.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/client/qwaylandxdgsurface_p.h b/src/client/qwaylandxdgsurface_p.h index ffbe41a44..1a53a772d 100644 --- a/src/client/qwaylandxdgsurface_p.h +++ b/src/client/qwaylandxdgsurface_p.h @@ -53,9 +53,10 @@ class QWaylandWindow; class QWaylandInputDevice; class QWaylandExtendedSurface; -class Q_WAYLAND_CLIENT_EXPORT QWaylandXdgSurface : public QtWayland::xdg_surface - , public QWaylandShellSurface +class Q_WAYLAND_CLIENT_EXPORT QWaylandXdgSurface : public QWaylandShellSurface + , public QtWayland::xdg_surface { + Q_OBJECT public: QWaylandXdgSurface(struct ::xdg_surface *shell_surface, QWaylandWindow *window); virtual ~QWaylandXdgSurface(); |