diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-28 10:09:27 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@gmail.com> | 2016-08-28 10:12:09 +0200 |
| commit | b0c416dede8b6ca596eb2a13361d98613e8c9533 (patch) | |
| tree | adddaa3622e0013858355ad6994c8e6e892ce254 /src/compositor/compositor_api/qwaylandquicksurface.cpp | |
| parent | 9610eccdf237c5ffc21630cee9c364d0fe871901 (diff) | |
| parent | ae9bfd29b42156fb8f04dfa60b9e48ce10ebacb8 (diff) | |
Merge remote-tracking branch 'qt/5.7' into 5.8v5.8.0-alpha1
Conflicts:
src/compositor/compositor_api/qwaylandseat.cpp
src/compositor/compositor_api/qwaylandview.cpp
tests/auto/compositor/compositor.pro
tests/auto/compositor/compositor/testinputdevice.cpp
tests/auto/compositor/compositor/testinputdevice.h
tests/auto/compositor/testinputdevice.cpp
tests/auto/compositor/testinputdevice.h
tests/auto/compositor/testseat.cpp
tests/auto/compositor/testseat.h
Change-Id: I98e045908dd964e5d4120bd35e71b8839c0d923a
Diffstat (limited to 'src/compositor/compositor_api/qwaylandquicksurface.cpp')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandquicksurface.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compositor/compositor_api/qwaylandquicksurface.cpp b/src/compositor/compositor_api/qwaylandquicksurface.cpp index 0fc07c6c5..30a94556f 100644 --- a/src/compositor/compositor_api/qwaylandquicksurface.cpp +++ b/src/compositor/compositor_api/qwaylandquicksurface.cpp @@ -87,7 +87,7 @@ QWaylandQuickSurface::~QWaylandQuickSurface() } /*! - * \qmlproperty QtWaylandCompositor::WaylandSurface::useTextureAlpha + * \qmlproperty bool QtWaylandCompositor::WaylandSurface::useTextureAlpha * * This property specifies whether the surface should use texture alpha. */ @@ -108,7 +108,7 @@ void QWaylandQuickSurface::setUseTextureAlpha(bool useTextureAlpha) } /*! - * \qmlproperty QtWaylandCompositor::WaylandSurface::clientRenderingEnabled + * \qmlproperty bool QtWaylandCompositor::WaylandSurface::clientRenderingEnabled * * This property specifies whether client rendering is enabled for the surface. */ |