summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-06-28 18:24:20 +0200
committerLiang Qi <liang.qi@qt.io>2018-06-28 20:56:59 +0200
commitefbeace6ffa14de0f7a1ec8b8b9653056612d5f8 (patch)
treeeb2b2fccc7aa1422ed7be48e97c6fa90b057680a /examples
parent4d9e127d3c3171bd796c5d6fc7c1c2f70101ad34 (diff)
parent56e01f9e3372446d20f0bb70bed0b88348f2a74b (diff)
downloadqtwayland-efbeace6ffa14de0f7a1ec8b8b9653056612d5f8.tar.gz
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts: src/client/qwaylandxdgsurface.cpp src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgsurfacev5.cpp src/plugins/shellintegration/xdg-shell-v6/qwaylandxdgshellv6.cpp src/plugins/shellintegration/xdg-shell-v6/qwaylandxdgshellv6_p.h Done-with: Johan Klokkhammer Helsing <johan.helsing@qt.io> Change-Id: Ia39be6254a95af1c4efa831358cc06a697da3423
Diffstat (limited to 'examples')
-rw-r--r--examples/wayland/overview-compositor/doc/src/overview-compositor.qdoc3
1 files changed, 2 insertions, 1 deletions
diff --git a/examples/wayland/overview-compositor/doc/src/overview-compositor.qdoc b/examples/wayland/overview-compositor/doc/src/overview-compositor.qdoc
index c34eeb2a..50408bc5 100644
--- a/examples/wayland/overview-compositor/doc/src/overview-compositor.qdoc
+++ b/examples/wayland/overview-compositor/doc/src/overview-compositor.qdoc
@@ -28,6 +28,7 @@
/*!
* \title Qt Wayland Compositor Examples - Overview Compositor
* \example overview-compositor
- * \brief Overview Compositor shows how to switch between clients in a grid
+ * \brief Overview Compositor shows how to switch between clients in a grid.
+ *
* \ingroup qtwaylandcompositor-examples
*/