diff options
| author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-24 16:51:01 +0200 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-28 13:10:33 +0200 |
| commit | d2d70779224b067f6035f431319036054272ce65 (patch) | |
| tree | 0ea297990553ff75cf82fb840d59dde903903dcd /src/compositor/compositor_api/qwaylandoutput.cpp | |
| parent | 88f821e189bd1d4d4550c1864f622ca7df2a7c34 (diff) | |
Make the default wl_shell available from QML
This finaly ties together how to use QWaylandQuickItems with different
shells
It was required to decouple QWaylandView from the QWaylandQuickItem
since QML doesn't play to well with muliple inheritance. The
QWaylandQuickItem can be retrieved from the QWaylandView which is now
conveniently a QObject. Also the QWaylandQuickItem owns the
QWaylandView. This architecture also leaves room for creating a
QWaylandWidget :)
Change-Id: Ib8a00e6f17f0f1bfc3ff244753f021c76db22cb1
Diffstat (limited to 'src/compositor/compositor_api/qwaylandoutput.cpp')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandoutput.cpp | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/compositor/compositor_api/qwaylandoutput.cpp b/src/compositor/compositor_api/qwaylandoutput.cpp index 5a83796ef..b445b1372 100644 --- a/src/compositor/compositor_api/qwaylandoutput.cpp +++ b/src/compositor/compositor_api/qwaylandoutput.cpp @@ -156,11 +156,6 @@ void QWaylandOutputPrivate::sendGeometryInfo() } -void QWaylandOutputPrivate::addView(QWaylandView *view) -{ - addView(view, view->surface()); -} - void QWaylandOutputPrivate::addView(QWaylandView *view, QWaylandSurface *surface) { for (int i = 0; i < surfaceViews.size(); i++) { @@ -175,11 +170,6 @@ void QWaylandOutputPrivate::addView(QWaylandView *view, QWaylandSurface *surface surfaceViews.append(QWaylandSurfaceViewMapper(surface,view)); } -void QWaylandOutputPrivate::removeView(QWaylandView *view) -{ - removeView(view, view->surface()); -} - void QWaylandOutputPrivate::removeView(QWaylandView *view, QWaylandSurface *surface) { Q_Q(QWaylandOutput); @@ -197,14 +187,6 @@ void QWaylandOutputPrivate::removeView(QWaylandView *view, QWaylandSurface *surf qWarning("%s Could not find view %p for surface %p to remove. Possible invalid state", Q_FUNC_INFO, view, surface); } -void QWaylandOutputPrivate::updateSurfaceForView(QWaylandView *view, QWaylandSurface *newSurface, QWaylandSurface *oldSurface) -{ - if (newSurface == oldSurface) - return; - removeView(view, oldSurface); - addView(view, newSurface); -} - QWaylandOutput::QWaylandOutput(QWaylandOutputSpace *outputSpace, QWindow *window, const QString &manufacturer, const QString &model) : QObject(*new QWaylandOutputPrivate(outputSpace->compositor(), window, manufacturer, model)) |