diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2017-10-25 14:06:54 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2017-10-25 14:06:54 +0200 |
| commit | 523cf490b4c46916c6f5253c666a492f5cce2aad (patch) | |
| tree | b4514f338b143ab430fe2b91ec7699cb176a147e /src/compositor/compositor_api/qwaylandclient.cpp | |
| parent | 8e3c71b2d1ec37222bf1648aa23eb033062b4ea6 (diff) | |
| parent | f1407493d6d25f24a3c71fbcedc00598baa44b56 (diff) | |
Merge remote-tracking branch 'qt/5.9' into 5.10v5.10.0-beta3
Change-Id: I6c283081669594b3e8c6b30194bb96e389319cb2
Diffstat (limited to 'src/compositor/compositor_api/qwaylandclient.cpp')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandclient.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compositor/compositor_api/qwaylandclient.cpp b/src/compositor/compositor_api/qwaylandclient.cpp index 48675c495..f6b5564b8 100644 --- a/src/compositor/compositor_api/qwaylandclient.cpp +++ b/src/compositor/compositor_api/qwaylandclient.cpp @@ -167,7 +167,7 @@ QWaylandClient *QWaylandClient::fromWlClient(QWaylandCompositor *compositor, wl_ } /*! - * \qmlproperty object QtWaylandCompositor::WaylandClient::compositor + * \qmlproperty WaylandCompositor QtWaylandCompositor::WaylandClient::compositor * * This property holds the compositor of this WaylandClient. */ |