From 0a7ae4374e9b3c0128388e5b68075f6f06347c71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Lind?= Date: Wed, 29 Jul 2015 14:38:18 +0200 Subject: Make it possible to set a QWaylandSurface on the QWaylandSurfaceView This will allow us to use QWaylandSurfaceItem from within QML Change-Id: I6ecfbf3a5de5f5a748a6a85295b9741316fef976 --- src/compositor/compositor_api/qwaylandquickcompositor.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/compositor/compositor_api/qwaylandquickcompositor.cpp') diff --git a/src/compositor/compositor_api/qwaylandquickcompositor.cpp b/src/compositor/compositor_api/qwaylandquickcompositor.cpp index 977b8a4a5..15923659d 100644 --- a/src/compositor/compositor_api/qwaylandquickcompositor.cpp +++ b/src/compositor/compositor_api/qwaylandquickcompositor.cpp @@ -97,11 +97,6 @@ void QWaylandQuickCompositor::setExposeDefaultShell(bool defaultShell) m_exposeDefaultShell = defaultShell; } -QWaylandSurfaceView *QWaylandQuickCompositor::createView(QWaylandSurface *surf) -{ - return new QWaylandSurfaceItem(static_cast(surf)); -} - QWaylandOutput *QWaylandQuickCompositor::createOutput(QWindow *window, const QString &manufacturer, const QString &model) @@ -113,6 +108,11 @@ QWaylandOutput *QWaylandQuickCompositor::createOutput(QWindow *window, return new QWaylandQuickOutput(this, quickWindow, manufacturer, model); } +QWaylandSurfaceView *QWaylandQuickCompositor::createView() +{ + return new QWaylandSurfaceItem(); +} + QWaylandSurface *QWaylandQuickCompositor::createSurface(QWaylandClient *client, quint32 id, int version) { return new QWaylandQuickSurface(client->client(), id, version, this); -- cgit v1.2.3