diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2016-08-04 13:14:48 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2016-08-04 13:23:22 +0200 |
| commit | 8bd79c7d37bc5dc72e9fffb43e01bd7ddc93b94f (patch) | |
| tree | 12d855187952755b374dab0378129039c67ca185 /src/compositor/extensions/qwaylandxdgshell.cpp | |
| parent | a147fedc76c84d2a6b50820a685288efb43f80db (diff) | |
| parent | 19cdda76e8e1803c3c36252088e2f8d756e7cbea (diff) | |
Merge remote-tracking branch 'qt/5.7' into dev
Change-Id: Ib22055ac52c0bb36081242948c72332db4e5ac64
Diffstat (limited to 'src/compositor/extensions/qwaylandxdgshell.cpp')
| -rw-r--r-- | src/compositor/extensions/qwaylandxdgshell.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compositor/extensions/qwaylandxdgshell.cpp b/src/compositor/extensions/qwaylandxdgshell.cpp index 96fc171d8..d818736ff 100644 --- a/src/compositor/extensions/qwaylandxdgshell.cpp +++ b/src/compositor/extensions/qwaylandxdgshell.cpp @@ -648,7 +648,7 @@ QWaylandXdgSurface::QWaylandXdgSurface() /*! * Constructs a QWaylandXdgSurface for \a surface and initializes it with the - * given \a xdgShell, \a surface and \a resource. + * given \a xdgShell, \a surface, and resource \a res. */ QWaylandXdgSurface::QWaylandXdgSurface(QWaylandXdgShell *xdgShell, QWaylandSurface *surface, const QWaylandResource &res) : QWaylandShellSurfaceTemplate<QWaylandXdgSurface>(*new QWaylandXdgSurfacePrivate) @@ -740,7 +740,7 @@ QWaylandSurface *QWaylandXdgSurface::surface() const */ /*! - * \property QWaylandXdgSurface::surface + * \property QWaylandXdgSurface::parentSurface * * This property holds the XdgSurface parent of this XdgSurface. * When a parent surface is set, the parentSurfaceChanged() signal |