diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-05 20:40:56 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-05 20:40:56 +0200 |
| commit | 6c859cf7b5f1814cfcd3dabb1b82f33c2cf8a649 (patch) | |
| tree | 81985e691abb11f120a249c5cfca7354a2aaa184 /src/compositor/compositor_api/qwaylandview.cpp | |
| parent | ee1181115961163a0ba6ac7a7661521c955ec16d (diff) | |
| parent | 04f6ff77ef0c8858629766e191ecc3d4ef056848 (diff) | |
| download | qtwayland-6c859cf7b5f1814cfcd3dabb1b82f33c2cf8a649.tar.gz | |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: I7c3c1fb4535fe13b34a1b056bb16256e7f8057c0
Diffstat (limited to 'src/compositor/compositor_api/qwaylandview.cpp')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandview.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/compositor/compositor_api/qwaylandview.cpp b/src/compositor/compositor_api/qwaylandview.cpp index 3114fce0..4de2405c 100644 --- a/src/compositor/compositor_api/qwaylandview.cpp +++ b/src/compositor/compositor_api/qwaylandview.cpp @@ -118,10 +118,11 @@ QObject *QWaylandView::renderObject() const return d->renderObject; } /*! -* \qmlproperty object QtWaylandCompositor::WaylandView::surface -* -* This property holds the surface viewed by this WaylandView. -*/ + * \qmlproperty object QtWaylandCompositor::WaylandView::surface + * + * This property holds the surface viewed by this WaylandView. + */ + /*! * \property QWaylandView::surface * |