summaryrefslogtreecommitdiffstats
path: root/src/compositor/extensions/qwaylandwlshell.cpp
diff options
context:
space:
mode:
authorNico Vertriest <nico.vertriest@theqtcompany.com>2016-06-21 16:19:50 +0200
committerTopi Reiniƶ <topi.reinio@theqtcompany.com>2016-08-02 07:55:27 +0000
commit71d55dedf766e150978f9e005de5f854157bac39 (patch)
tree917fc7a6ec757354937bdce28ca291e14f73a5a7 /src/compositor/extensions/qwaylandwlshell.cpp
parent6260c4376e598031e467416027703bd11012621d (diff)
Doc: several minor link issues in QtWayland
Change-Id: I9e656b02e1b820e2257d95948650c541656192b4 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Topi Reiniƶ <topi.reinio@theqtcompany.com>
Diffstat (limited to 'src/compositor/extensions/qwaylandwlshell.cpp')
-rw-r--r--src/compositor/extensions/qwaylandwlshell.cpp13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/compositor/extensions/qwaylandwlshell.cpp b/src/compositor/extensions/qwaylandwlshell.cpp
index e3ab2eecb..93bad2938 100644
--- a/src/compositor/extensions/qwaylandwlshell.cpp
+++ b/src/compositor/extensions/qwaylandwlshell.cpp
@@ -326,12 +326,9 @@ const struct wl_interface *QWaylandWlShell::interface()
*/
/*!
- * \fn void QWaylandWlShell::createShellSurface(QWaylandSurface *surface, QWaylandClient *client, uint id)
+ * \fn void QWaylandWlShell::createShellSurface(QWaylandSurface *surface, const QWaylandResource &resource)
*
- * This signal is emitted when the \a client has requested a shell surface to be associated
- * with \a surface and be assigned the given \a id. The handler for this signal is
- * expected to create the shell surface and initialize it within the scope of the
- * signal emission.
+ * Constructs a QWaylandSurface, assigns it to \a surface and initializes it with the given \a resource.
*/
/*!
@@ -377,7 +374,7 @@ QWaylandWlShellSurface::QWaylandWlShellSurface()
}
/*!
- * Constructs a QWaylandWlShellSurface for \a surface and initializes it with the given \a shell and \a resource.
+ * Constructs a QWaylandWlShellSurface for \a surface and initializes it with the given \a shell and resource \a res.
*/
QWaylandWlShellSurface::QWaylandWlShellSurface(QWaylandWlShell *shell, QWaylandSurface *surface, const QWaylandResource &res)
: QWaylandShellSurfaceTemplate<QWaylandWlShellSurface>(*new QWaylandWlShellSurfacePrivate)
@@ -586,12 +583,12 @@ QWaylandSurfaceRole *QWaylandWlShellSurface::role()
/*!
* \qmlmethod void QtWaylandCompositor::WlShellSurface::ping()
*
- * Sends a ping event to the client. If the client replies to the event the \a pong
+ * Sends a ping event to the client. If the client replies to the event the pong
* signal will be emitted.
*/
/*!
- * Sends a ping event to the client. If the client replies to the event the \a pong
+ * Sends a ping event to the client. If the client replies to the event the pong
* signal will be emitted.
*/
void QWaylandWlShellSurface::ping()