diff options
| author | Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> | 2016-06-15 20:17:58 +0200 |
|---|---|---|
| committer | Pier Luigi Fiorini <pierluigi.fiorini@hawaiios.org> | 2016-06-23 16:06:02 +0000 |
| commit | 5c9be7fc18e4b3c7cfa2e5b562dc25ed0006035c (patch) | |
| tree | 6097d8c49d53ce9e1042de0a69652cb70d9065e4 | |
| parent | e3cd3459c304ea6b35d95d6e40b90dfe43bd2a68 (diff) | |
Add compositor property to QWaylandClient
Change-Id: Ia74d0e0cda731d1833da154b6c1739e57f73834a
Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
| -rw-r--r-- | src/compositor/compositor_api/qwaylandclient.cpp | 18 | ||||
| -rw-r--r-- | src/compositor/compositor_api/qwaylandclient.h | 3 |
2 files changed, 21 insertions, 0 deletions
diff --git a/src/compositor/compositor_api/qwaylandclient.cpp b/src/compositor/compositor_api/qwaylandclient.cpp index d2da470a4..2b6091f93 100644 --- a/src/compositor/compositor_api/qwaylandclient.cpp +++ b/src/compositor/compositor_api/qwaylandclient.cpp @@ -164,6 +164,24 @@ QWaylandClient *QWaylandClient::fromWlClient(QWaylandCompositor *compositor, wl_ } /*! + * \qmlproperty object QtWaylandCompositor::WaylandClient::compositor + * + * This property holds the compositor of this WaylandClient. + */ + +/*! + * \property QWaylandClient::compositor + * + * This property holds the compositor of this QWaylandClient. + */ +QWaylandCompositor *QWaylandClient::compositor() const +{ + Q_D(const QWaylandClient); + + return d->compositor; +} + +/*! * Returns the Wayland client of this QWaylandClient. */ wl_client *QWaylandClient::client() const diff --git a/src/compositor/compositor_api/qwaylandclient.h b/src/compositor/compositor_api/qwaylandclient.h index 26e7b95e5..50e7baf72 100644 --- a/src/compositor/compositor_api/qwaylandclient.h +++ b/src/compositor/compositor_api/qwaylandclient.h @@ -55,6 +55,7 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandClient : public QObject Q_OBJECT Q_DECLARE_PRIVATE(QWaylandClient) + Q_PROPERTY(QWaylandCompositor *compositor READ compositor CONSTANT) Q_PROPERTY(qint64 userId READ userId CONSTANT) Q_PROPERTY(qint64 groupId READ groupId CONSTANT) Q_PROPERTY(qint64 processId READ processId CONSTANT) @@ -63,6 +64,8 @@ public: static QWaylandClient *fromWlClient(QWaylandCompositor *compositor, wl_client *wlClient); + QWaylandCompositor *compositor() const; + wl_client *client() const; qint64 userId() const; |