diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2017-10-27 10:37:21 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2017-10-27 10:37:21 +0200 |
| commit | 62293cefae129bbfebb0317b39d059b0abb1a16a (patch) | |
| tree | 159080c98a85baa02e34776cf2618642ae55d456 /src/compositor/compositor_api/qwaylandview.cpp | |
| parent | c2b272ac73617a8d5ff25151534feda95ace63ee (diff) | |
| parent | 523cf490b4c46916c6f5253c666a492f5cce2aad (diff) | |
Merge remote-tracking branch 'qt/5.10' into dev
Change-Id: I4f885a551093ada07da97fd3d99902e36f98595e
Diffstat (limited to 'src/compositor/compositor_api/qwaylandview.cpp')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandview.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/compositor/compositor_api/qwaylandview.cpp b/src/compositor/compositor_api/qwaylandview.cpp index 4de2405ca..4d6f392e1 100644 --- a/src/compositor/compositor_api/qwaylandview.cpp +++ b/src/compositor/compositor_api/qwaylandview.cpp @@ -99,9 +99,6 @@ QWaylandView::~QWaylandView() if (d->surface) { if (d->output) QWaylandOutputPrivate::get(d->output)->removeView(this, d->surface); - QWaylandSeat *i = d->surface->compositor()->defaultSeat(); - if (i->mouseFocus() == this) - i->setMouseFocus(nullptr); QWaylandSurfacePrivate::get(d->surface)->derefView(this); } @@ -117,8 +114,9 @@ QObject *QWaylandView::renderObject() const Q_D(const QWaylandView); return d->renderObject; } + /*! - * \qmlproperty object QtWaylandCompositor::WaylandView::surface + * \qmlproperty WaylandSurface QtWaylandCompositor::WaylandView::surface * * This property holds the surface viewed by this WaylandView. */ @@ -169,7 +167,7 @@ void QWaylandView::setSurface(QWaylandSurface *newSurface) } /*! - * \qmlproperty object QtWaylandCompositor::WaylandView::output + * \qmlproperty WaylandOutput QtWaylandCompositor::WaylandView::output * * This property holds the output on which this view displays its surface. */ |