diff options
author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-07-30 12:06:24 +0200 |
---|---|---|
committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-28 13:09:41 +0200 |
commit | fcd376a4ffb4a2efc8352ce1777e9f869e4e5206 (patch) | |
tree | ab6959cf4d777549dca119d318240b9b724860ce /src/compositor/compositor_api/qwaylandquickcompositor.cpp | |
parent | 400c6d24c2ca3215cd38a30cd3eb530c3b2e970c (diff) |
Introducing QWaylandOutputSpace
Its purpose is to make it possible to have multiscreen environments, and
also multiple multioutput environments
It is also an abstraction to make it clear that outputs are arranged in
a 2d space
Change-Id: I418509996a03b2ca1a12aec9c9e25e143a15a10f
Diffstat (limited to 'src/compositor/compositor_api/qwaylandquickcompositor.cpp')
-rw-r--r-- | src/compositor/compositor_api/qwaylandquickcompositor.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/compositor/compositor_api/qwaylandquickcompositor.cpp b/src/compositor/compositor_api/qwaylandquickcompositor.cpp index 7c37e6c59..39dae9461 100644 --- a/src/compositor/compositor_api/qwaylandquickcompositor.cpp +++ b/src/compositor/compositor_api/qwaylandquickcompositor.cpp @@ -99,7 +99,8 @@ void QWaylandQuickCompositor::setExposeDefaultShell(bool defaultShell) m_exposeDefaultShell = defaultShell; } -QWaylandOutput *QWaylandQuickCompositor::createOutput(QWindow *window, +QWaylandOutput *QWaylandQuickCompositor::createOutput(QWaylandOutputSpace *outputSpace, + QWindow *window, const QString &manufacturer, const QString &model) { @@ -109,7 +110,7 @@ QWaylandOutput *QWaylandQuickCompositor::createOutput(QWindow *window, if (!quickWindow) qFatal("%s: couldn't cast QWindow to QQuickWindow. All output windows must " "be QQuickWindow derivates when using QWaylandQuickCompositor", Q_FUNC_INFO); - QWaylandQuickOutput *output = new QWaylandQuickOutput(this, quickWindow, manufacturer, model); + QWaylandQuickOutput *output = new QWaylandQuickOutput(outputSpace, quickWindow, manufacturer, model); QQmlEngine::setObjectOwnership(output, QQmlEngine::CppOwnership); return output; } |