diff options
author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-07-29 14:38:18 +0200 |
---|---|---|
committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-28 13:09:41 +0200 |
commit | 0a7ae4374e9b3c0128388e5b68075f6f06347c71 (patch) | |
tree | 639304bdf32aaf4a42521c989c338ed407d97a53 /src/compositor/compositor_api/qwaylandcompositor.h | |
parent | 42d052afccd9a968bc9897a84866f25b80ec2646 (diff) |
Make it possible to set a QWaylandSurface on the QWaylandSurfaceView
This will allow us to use QWaylandSurfaceItem from within QML
Change-Id: I6ecfbf3a5de5f5a748a6a85295b9741316fef976
Diffstat (limited to 'src/compositor/compositor_api/qwaylandcompositor.h')
-rw-r--r-- | src/compositor/compositor_api/qwaylandcompositor.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compositor/compositor_api/qwaylandcompositor.h b/src/compositor/compositor_api/qwaylandcompositor.h index fc96da35e..a203fa265 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.h +++ b/src/compositor/compositor_api/qwaylandcompositor.h @@ -166,7 +166,7 @@ public: Q_DECLARE_FLAGS(TouchExtensionFlags, TouchExtensionFlag) void configureTouchExtension(TouchExtensionFlags flags); - virtual QWaylandSurfaceView *createView(QWaylandSurface *surface); + QWaylandSurfaceView *createSurfaceView(QWaylandSurface *surface); QWaylandInputDevice *inputDeviceFor(QInputEvent *inputEvent); @@ -185,6 +185,7 @@ protected: const QString &manufacturer, const QString &model); virtual QWaylandSurface *createSurface(QWaylandClient *client, quint32 id, int version); + virtual QWaylandSurfaceView *createView(); friend class QtWayland::Compositor; QtWayland::Compositor *m_compositor; |