summaryrefslogtreecommitdiffstats
path: root/src/compositor/compositor_api/qwaylandquickcompositor.cpp
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@theqtcompany.com>2015-07-29 14:38:18 +0200
committerJørgen Lind <jorgen.lind@theqtcompany.com>2015-08-28 13:09:41 +0200
commit0a7ae4374e9b3c0128388e5b68075f6f06347c71 (patch)
tree639304bdf32aaf4a42521c989c338ed407d97a53 /src/compositor/compositor_api/qwaylandquickcompositor.cpp
parent42d052afccd9a968bc9897a84866f25b80ec2646 (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/qwaylandquickcompositor.cpp')
-rw-r--r--src/compositor/compositor_api/qwaylandquickcompositor.cpp10
1 files changed, 5 insertions, 5 deletions
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<QWaylandQuickSurface *>(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);