summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2017-09-26 11:27:07 +0200
committerJohan Helsing <johan.helsing@qt.io>2017-10-02 08:11:34 +0000
commitff22565d0f76a422d0a6299d56e47045b8c18a38 (patch)
tree6b0eb974703001801b0b3fee7dec73a74803102a
parentffee1b3fb8c8e76d9317547376c8f13b0e17b494 (diff)
Documentation: Add QML return types for XdgShellV6* types
And also fix copy-paste error for parentXdgSurface Change-Id: Ife15e8fc7a59a0effa0c9f00689273db3699eca6 Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
-rw-r--r--src/compositor/extensions/qwaylandxdgshellv6.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/compositor/extensions/qwaylandxdgshellv6.cpp b/src/compositor/extensions/qwaylandxdgshellv6.cpp
index dc00e7204..ba8ca63df 100644
--- a/src/compositor/extensions/qwaylandxdgshellv6.cpp
+++ b/src/compositor/extensions/qwaylandxdgshellv6.cpp
@@ -556,7 +556,7 @@ void QWaylandXdgSurfaceV6::handleBufferScaleChanged()
}
/*!
- * \qmlproperty object QtWaylandCompositor::XdgSurfaceV6::shell
+ * \qmlproperty XdgShellV6 QtWaylandCompositor::XdgSurfaceV6::shell
*
* This property holds the shell associated with this XdgSurface.
*/
@@ -573,7 +573,7 @@ QWaylandXdgShellV6 *QWaylandXdgSurfaceV6::shell() const
}
/*!
- * \qmlproperty object QtWaylandCompositor::XdgSurfaceV6::surface
+ * \qmlproperty WaylandSurface QtWaylandCompositor::XdgSurfaceV6::surface
*
* This property holds the surface associated with this XdgSurface.
*/
@@ -680,7 +680,7 @@ QWaylandXdgToplevelV6::QWaylandXdgToplevelV6(QWaylandXdgSurfaceV6 *xdgSurface, Q
}
/*!
- * \qmlproperty object QtWaylandCompositor::XdgToplevelV6::parentToplevel
+ * \qmlproperty XdgToplevelV6 QtWaylandCompositor::XdgToplevelV6::parentToplevel
*
* This property holds the XdgToplevelV6 parent of this XdgToplevelV6.
*/
@@ -1348,7 +1348,7 @@ QWaylandXdgPopupV6::QWaylandXdgPopupV6(QWaylandXdgSurfaceV6 *xdgSurface, QWaylan
}
/*!
- * \qmlproperty object QtWaylandCompositor::XdgPopupV6::xdgSurface
+ * \qmlproperty XdgSurfaceV6 QtWaylandCompositor::XdgPopupV6::xdgSurface
*
* This property holds the XdgSurfaceV6 associated with this XdgPopupV6.
*/
@@ -1365,13 +1365,13 @@ QWaylandXdgSurfaceV6 *QWaylandXdgPopupV6::xdgSurface() const
}
/*!
- * \qmlproperty object QtWaylandCompositor::XdgPopupV6::xdgSurface
+ * \qmlproperty XdgSurfaceV6 QtWaylandCompositor::XdgPopupV6::parentXdgSurface
*
* This property holds the XdgSurfaceV6 associated with the parent of this XdgPopupV6.
*/
/*!
- * \property QWaylandXdgPopupV6::xdgSurface
+ * \property QWaylandXdgPopupV6::parentXdgSurface
*
* This property holds the QWaylandXdgSurfaceV6 associated with the parent of this
* QWaylandXdgPopupV6.