diff options
| author | Nico Vertriest <nico.vertriest@theqtcompany.com> | 2016-06-20 16:14:46 +0200 |
|---|---|---|
| committer | Nico Vertriest <nico.vertriest@theqtcompany.com> | 2016-06-21 08:21:57 +0000 |
| commit | 4a8137716a48bd881d2b109ea9ffe5bca95304fe (patch) | |
| tree | c065990d5dbed824965ae3b840b9a021d6bb085d /src/compositor | |
| parent | 6de4e14d6ba632ee32df2a703e0a6e6660fa61f6 (diff) | |
Doc: minor link issues QtWayland
Change-Id: I5ea47a8252f2915696d02052686f2c802a81878c
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Diffstat (limited to 'src/compositor')
4 files changed, 5 insertions, 5 deletions
diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp index 41de5b459..c7273f000 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.cpp +++ b/src/compositor/compositor_api/qwaylandcompositor.cpp @@ -410,7 +410,7 @@ void QWaylandCompositorPrivate::loadServerBufferIntegration() \brief Type managing the Wayland display server. The WaylandCompositor manages the connections to the clients, as well as the different - \l{WaylandOutput}{outputs} and \l{WaylandInput}{input devices}. + \l{WaylandOutput}{outputs} and \l{QWaylandInputDevice}{input devices}. Normally, a compositor application will have a single WaylandCompositor instance, which can have several outputs as children. When a client @@ -429,7 +429,7 @@ void QWaylandCompositorPrivate::loadServerBufferIntegration() \brief Class managing the Wayland display server. The QWaylandCompositor manages the connections to the clients, as well as the different \l{QWaylandOutput}{outputs} - and \l{QWaylandInput}{input devices}. + and \l{QWaylandInputDevice}{input devices}. Normally, a compositor application will have a single WaylandCompositor instance, which can have several outputs as children. diff --git a/src/compositor/compositor_api/qwaylandsurface.cpp b/src/compositor/compositor_api/qwaylandsurface.cpp index 85d1c7aa0..c4c004b25 100644 --- a/src/compositor/compositor_api/qwaylandsurface.cpp +++ b/src/compositor/compositor_api/qwaylandsurface.cpp @@ -543,7 +543,7 @@ int QWaylandSurface::bufferScale() const * * This property holds the orientation of the WaylandSurface's contents. * - * \sa QtWaylandCompositor::WaylandOutput::transform + * \sa QWaylandOutput::transform */ /*! diff --git a/src/compositor/doc/qtwaylandcompositor.qdocconf b/src/compositor/doc/qtwaylandcompositor.qdocconf index 125fb2b31..230978f07 100644 --- a/src/compositor/doc/qtwaylandcompositor.qdocconf +++ b/src/compositor/doc/qtwaylandcompositor.qdocconf @@ -29,7 +29,7 @@ qhp.QtWaylandCompositor.subprojects.examples.indexTitle = Qt Wayland Composi qhp.QtWaylandCompositor.subprojects.examples.selectors = fake:example qhp.QtWaylandCompositor.subprojects.examples.sortPages = true -depends += qtqml qtquick qtdoc qtquickcontrols +depends += qtqml qtquick qtdoc qtquickcontrols qmake qtgui exampledirs += ../../../examples/wayland/ headerdirs += ../ diff --git a/src/compositor/extensions/qwaylandwlshell.cpp b/src/compositor/extensions/qwaylandwlshell.cpp index 4e9937680..e3ab2eecb 100644 --- a/src/compositor/extensions/qwaylandwlshell.cpp +++ b/src/compositor/extensions/qwaylandwlshell.cpp @@ -245,7 +245,7 @@ void QWaylandWlShellSurfacePrivate::shell_surface_set_class(Resource *resource, * \preliminary * \brief Extension for desktop-style user interfaces. * - * The WlShell extension provides a way to assiociate a \l{ShellSurface} + * The WlShell extension provides a way to assiociate a ShellSurface * with a regular Wayland surface. Using the shell surface interface, the client * can request that the surface is resized, moved, and so on. * |