diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-30 13:35:37 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-30 14:28:55 +0200 |
| commit | b07e95e408fde45a0ce1a1b6683d432c9657e650 (patch) | |
| tree | 65a80f556bf54d188d17ff985f37eb138007c9f4 /src/compositor/compositor_api/qwaylandsurface.cpp | |
| parent | 4d4f44a70f663428241c83e26d073f5e5ece8b62 (diff) | |
| parent | cddeb1c7c0e9d02c5f5542d7d12b4fa992bfb050 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/compositor/extensions/qwaylandxdgshellintegration.cpp
Change-Id: I3e8666d0c2fd047f12daeb94b2c967c646576ed9
Diffstat (limited to 'src/compositor/compositor_api/qwaylandsurface.cpp')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandsurface.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compositor/compositor_api/qwaylandsurface.cpp b/src/compositor/compositor_api/qwaylandsurface.cpp index 027105d00..d039fc94f 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 */ /*! |