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 /src/compositor/compositor_api/qwaylandquickcompositor.cpp | |
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 'src/compositor/compositor_api/qwaylandquickcompositor.cpp')
-rw-r--r-- | src/compositor/compositor_api/qwaylandquickcompositor.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/compositor/compositor_api/qwaylandquickcompositor.cpp b/src/compositor/compositor_api/qwaylandquickcompositor.cpp index 46ef9e928..7d9893a15 100644 --- a/src/compositor/compositor_api/qwaylandquickcompositor.cpp +++ b/src/compositor/compositor_api/qwaylandquickcompositor.cpp @@ -85,9 +85,7 @@ void QWaylandQuickCompositor::setInitializeLegazyQmlNames(bool init) } QWaylandOutput *QWaylandQuickCompositor::createOutput(QWaylandOutputSpace *outputSpace, - QWindow *window, - const QString &manufacturer, - const QString &model) + QWindow *window) { QQmlEngine::setObjectOwnership(window, QQmlEngine::CppOwnership); @@ -95,7 +93,7 @@ QWaylandOutput *QWaylandQuickCompositor::createOutput(QWaylandOutputSpace *outpu 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(outputSpace, quickWindow, manufacturer, model); + QWaylandQuickOutput *output = new QWaylandQuickOutput(outputSpace, quickWindow); QQmlEngine::setObjectOwnership(output, QQmlEngine::CppOwnership); return output; } |