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.cpp | |
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.cpp')
-rw-r--r-- | src/compositor/compositor_api/qwaylandcompositor.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp index 906287a1c..a94abffcf 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.cpp +++ b/src/compositor/compositor_api/qwaylandcompositor.cpp @@ -202,6 +202,11 @@ void QWaylandCompositor::cleanupGraphicsResources() m_compositor->cleanupGraphicsResources(); } +QWaylandSurfaceView *QWaylandCompositor::createView() +{ + return new QWaylandSurfaceView(); +} + QWaylandSurfaceView *QWaylandCompositor::pickView(const QPointF &globalPosition) const { Q_FOREACH (QWaylandOutput *output, outputs()) { @@ -370,9 +375,12 @@ void QWaylandCompositor::configureTouchExtension(TouchExtensionFlags flags) m_compositor->configureTouchExtension(flags); } -QWaylandSurfaceView *QWaylandCompositor::createView(QWaylandSurface *surface) + +QWaylandSurfaceView *QWaylandCompositor::createSurfaceView(QWaylandSurface *surface) { - return new QWaylandSurfaceView(surface); + QWaylandSurfaceView *view = createView(); + view->setSurface(surface); + return view; } QWaylandInputDevice *QWaylandCompositor::inputDeviceFor(QInputEvent *inputEvent) |