diff options
| author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-09-01 10:51:39 +0200 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-09-02 12:13:41 +0200 |
| commit | 5addf79903a9007cfb65ad09e46d2c47f4a2cc37 (patch) | |
| tree | d6957e81250ce3d4714a54c7f77a4a1af4c7b165 /examples | |
| parent | 4f86a16f0366cea103b68d2e39e86eb3bbd30734 (diff) | |
Make Manufacturer & Model modifiable properties of QWaylandOutput
This to make construction look nicer and make them modifyable from QML
Change-Id: I5f5ffffb34f664914cdb531736c42a6873bfe18c
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/wayland/pure-qml/qml/main.qml | 2 | ||||
| -rw-r--r-- | examples/wayland/qml-compositor/main.cpp | 2 | ||||
| -rw-r--r-- | examples/wayland/qwindow-compositor/qwindowcompositor.cpp | 2 | ||||
| -rw-r--r-- | examples/wayland/server-buffer/compositor/main.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/examples/wayland/pure-qml/qml/main.qml b/examples/wayland/pure-qml/qml/main.qml index 642a60325..bcdab7e37 100644 --- a/examples/wayland/pure-qml/qml/main.qml +++ b/examples/wayland/pure-qml/qml/main.qml @@ -80,7 +80,7 @@ WaylandCompositor { function addScreen() { var screen = screenComponent.createObject(0, { "compositor" : compositor } ); primarySurfacesArea = screen.surfacesArea; - var output = compositor.primaryOutputSpace.addOutputWindow(screen, "", ""); + var output = compositor.primaryOutputSpace.addOutputWindow(screen); output.automaticFrameCallbacks = true; } diff --git a/examples/wayland/qml-compositor/main.cpp b/examples/wayland/qml-compositor/main.cpp index 333aea7c3..861a0be4c 100644 --- a/examples/wayland/qml-compositor/main.cpp +++ b/examples/wayland/qml-compositor/main.cpp @@ -72,7 +72,7 @@ public: setResizeMode(QQuickView::SizeRootObjectToView); setColor(Qt::black); winId(); - m_output = m_compositor.primaryOutputSpace()->addOutputWindow(this, "", ""); + m_output = m_compositor.primaryOutputSpace()->addOutputWindow(this); connect(this, SIGNAL(afterRendering()), this, SLOT(sendCallbacks())); connect(&m_compositor, &QWaylandCompositor::surfaceCreated, this, &QmlCompositor::onSurfaceCreated); diff --git a/examples/wayland/qwindow-compositor/qwindowcompositor.cpp b/examples/wayland/qwindow-compositor/qwindowcompositor.cpp index fad92510a..36b5d6816 100644 --- a/examples/wayland/qwindow-compositor/qwindowcompositor.cpp +++ b/examples/wayland/qwindow-compositor/qwindowcompositor.cpp @@ -147,7 +147,7 @@ void QWindowCompositor::create() { QWaylandCompositor::create(); - primaryOutputSpace()->addOutputWindow(m_window, "", ""); + primaryOutputSpace()->addOutputWindow(m_window); m_renderScheduler.setSingleShot(true); connect(&m_renderScheduler, &QTimer::timeout, this, &QWindowCompositor::render); diff --git a/examples/wayland/server-buffer/compositor/main.cpp b/examples/wayland/server-buffer/compositor/main.cpp index 3e182a595..d6e09dca4 100644 --- a/examples/wayland/server-buffer/compositor/main.cpp +++ b/examples/wayland/server-buffer/compositor/main.cpp @@ -86,7 +86,7 @@ public: m_view.setResizeMode(QQuickView::SizeRootObjectToView); m_view.setColor(Qt::black); m_view.create(); - m_output = primaryOutputSpace()->addOutputWindow(&m_view, "", ""); + m_output = primaryOutputSpace()->addOutputWindow(&m_view); connect(&m_view, &QQuickView::afterRendering, this, &QmlCompositor::sendCallbacks); |