diff options
| author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-11 16:07:23 +0200 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-28 13:10:33 +0200 |
| commit | e01b81339a37830c48f2cec0583e5d0aba592601 (patch) | |
| tree | bd3085460c0139a10c5fd5d322b9059e6c97b5ee /src/compositor/extensions/qwlsubsurface_p.h | |
| parent | bc331abe8e8ffaa3db12be7ae69e7b658dd700ac (diff) | |
Remove QtWayland::Surface
Its enough to have QWaylandSurface and QWaylandSurfacePrivate. Also
don't pass QWaylandSurfacePrivate around, but pass QWaylandSurface and
then use the QWaylandSurfacePrivate::get function.
Change-Id: I915cc9d7b4497ad1c6f1f2dee61d9d0db069ba6b
Diffstat (limited to 'src/compositor/extensions/qwlsubsurface_p.h')
| -rw-r--r-- | src/compositor/extensions/qwlsubsurface_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/compositor/extensions/qwlsubsurface_p.h b/src/compositor/extensions/qwlsubsurface_p.h index d86b6e7ea..70083fca3 100644 --- a/src/compositor/extensions/qwlsubsurface_p.h +++ b/src/compositor/extensions/qwlsubsurface_p.h @@ -37,16 +37,16 @@ #ifndef WLSUBSURFACE_H #define WLSUBSURFACE_H -#include <private/qwlsurface_p.h> - #include <QtCompositor/private/qwayland-server-sub-surface-extension.h> +#include <QtCompositor/QWaylandExtension> +#include <QtCompositor/QWaylandSurface> + #include <QtCore/QLinkedList> QT_BEGIN_NAMESPACE class Compositor; -class QWaylandSurface; namespace QtWayland { @@ -62,7 +62,7 @@ private: void sub_surface_extension_get_sub_surface_aware_surface(Resource *resource, uint32_t id, struct ::wl_resource *surface) Q_DECL_OVERRIDE; }; -class SubSurface : public QWaylandExtensionTemplate<SubSurface>, public QtWaylandServer::qt_sub_surface +class Q_COMPOSITOR_EXPORT SubSurface : public QWaylandExtensionTemplate<SubSurface>, public QtWaylandServer::qt_sub_surface { Q_OBJECT Q_PROPERTY(SubSurface *parent READ parent WRITE setParent NOTIFY parentChanged) |