diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-04 10:42:45 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-04 10:42:45 +0200 |
| commit | 04f6ff77ef0c8858629766e191ecc3d4ef056848 (patch) | |
| tree | d3684e21bf277bdd2b0d284042d627d97ad528db /src/compositor/compositor_api/qwaylandview.cpp | |
| parent | a81fc596a3cbcc07396be1c0284f1ee8aa44ff8c (diff) | |
| parent | 00a99e631459eb7e52fde822c24d7b9d603008c4 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta1
Change-Id: I83392c13a9cea972fbb570a9510a19f401675283
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 1ce923d48..f56cb0b8e 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 * |