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/extensions/qwaylandquickshellsurfaceitem.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/extensions/qwaylandquickshellsurfaceitem.cpp')
| -rw-r--r-- | src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp b/src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp index 5fe43e547..9cb65fbef 100644 --- a/src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp +++ b/src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp @@ -46,19 +46,21 @@ QT_BEGIN_NAMESPACE * \qmltype ShellSurfaceItem * \inqmlmodule QtWayland.Compositor * \preliminary - * \brief An item representing a WlShellSurface. + * \brief A Qt Quick item type representing a WlShellSurface. * - * This type is used to render wl_shell or xdg_shell surfaces as part of a Qt Quick + * This type is used to render \c wl_shell or \c xdg_shell surfaces as part of a Qt Quick * scene. It handles moving and resizing triggered by clicking on the window decorations. + * + * \sa WaylandQuickItem */ /*! * \class QWaylandQuickShellSurfaceItem * \inmodule QtWaylandCompositor * \preliminary - * \brief A Qt Quick item for QWaylandShellSurface. + * \brief The QWaylandQuickShellSurfaceItem class provides a Qt Quick item that represents a QWaylandShellSurface. * - * This class is used to render wl_shell or xdg_shell surfaces as part of a Qt Quick + * This class is used to render \c wl_shell or \c xdg_shell surfaces as part of a Qt Quick * scene. It handles moving and resizing triggered by clicking on the window decorations. * * \sa QWaylandQuickItem |