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/qwaylandclient.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/qwaylandclient.cpp')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandclient.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/compositor/compositor_api/qwaylandclient.cpp b/src/compositor/compositor_api/qwaylandclient.cpp index 0b21bcd63..23c3745d7 100644 --- a/src/compositor/compositor_api/qwaylandclient.cpp +++ b/src/compositor/compositor_api/qwaylandclient.cpp @@ -88,7 +88,7 @@ public: * \qmltype WaylandClient * \inqmlmodule QtWayland.Compositor * \preliminary - * \brief A client connecting to the WaylandCompositor. + * \brief Represents a client connecting to the WaylandCompositor. * * This type represents a client connecting to the compositor using the Wayland protocol. * It corresponds to the Wayland interface wl_client. @@ -98,7 +98,7 @@ public: * \class QWaylandClient * \inmodule QtWaylandCompositor * \preliminary - * \brief A client connecting to the QWaylandCompositor. + * \brief The QWaylandClient class represents a client connecting to the QWaylandCompositor. * * This class corresponds to a client connecting to the compositor using the Wayland protocol. * It corresponds to the Wayland interface wl_client. @@ -199,6 +199,7 @@ wl_client *QWaylandClient::client() const /*! * \property QWaylandClient::userId + * \readonly * * This property holds the user id of this QWaylandClient. */ @@ -211,6 +212,7 @@ qint64 QWaylandClient::userId() const /*! * \qmlproperty int QtWaylandCompositor::WaylandClient::groupId + * \readonly * * This property holds the group id of this WaylandClient. */ @@ -229,6 +231,7 @@ qint64 QWaylandClient::groupId() const /*! * \qmlproperty int QtWaylandCompositor::WaylandClient::processId + * \readonly * * This property holds the process id of this WaylandClient. */ |