diff options
| author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-01-12 12:59:49 +0100 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-28 13:09:41 +0200 |
| commit | 030a09ad7ad0eaa81823f7eb90e8512da2ba097b (patch) | |
| tree | 9e653b1864b4e13f9be0a052944b84fc468a355d /src/compositor/compositor_api/qwaylandcompositor.h | |
| parent | 32f5fcd8940cb00ed1db78f4b8bb45be7f3747cd (diff) | |
QWaylandCompositor make some functionality available from qml
Change-Id: Idb84b75da2374ecd8c72e14857018d4965f0a927
Diffstat (limited to 'src/compositor/compositor_api/qwaylandcompositor.h')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandcompositor.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/compositor/compositor_api/qwaylandcompositor.h b/src/compositor/compositor_api/qwaylandcompositor.h index 211bc9dd6..a987a7740 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.h +++ b/src/compositor/compositor_api/qwaylandcompositor.h @@ -71,6 +71,7 @@ class Q_COMPOSITOR_EXPORT QWaylandCompositor : public QObject Q_OBJECT Q_PROPERTY(QByteArray socketName READ socketName WRITE setSocketName) Q_PROPERTY(QWaylandCompositor::ExtensionFlags extensionFlags READ extensionFlags WRITE setExtensionFlags) + Q_PROPERTY(bool retainedSelection READ retainedSelectionEnabled WRITE setRetainedSelectionEnabled) Q_PROPERTY(QWaylandOutput *primaryOutput READ primaryOutput WRITE setPrimaryOutput NOTIFY primaryOutputChanged) public: @@ -104,8 +105,8 @@ public: ::wl_display *waylandDisplay() const; - void destroyClientForSurface(QWaylandSurface *surface); - void destroyClient(QWaylandClient *client); + Q_INVOKABLE void destroyClientForSurface(QWaylandSurface *surface); + Q_INVOKABLE void destroyClient(QWaylandClient *client); #if QT_DEPRECATED_SINCE(5, 5) QT_DEPRECATED void frameStarted(); @@ -115,14 +116,14 @@ public: QT_DEPRECATED QList<QWaylandSurface *> surfaces() const; #endif //QT_DEPRECATED_SINCE(5, 5) - QList<QWaylandOutput *> outputs() const; - QWaylandOutput *output(QWindow *window); + Q_INVOKABLE QList<QWaylandOutput *> outputs() const; + Q_INVOKABLE QWaylandOutput *output(QWindow *window); QWaylandOutput *primaryOutput() const; void setPrimaryOutput(QWaylandOutput *output); - virtual QWaylandSurfaceView *pickView(const QPointF &globalPosition) const; - virtual QPointF mapToView(QWaylandSurfaceView *view, const QPointF &surfacePosition) const; + Q_INVOKABLE virtual QWaylandSurfaceView *pickView(const QPointF &globalPosition) const; + Q_INVOKABLE virtual QPointF mapToView(QWaylandSurfaceView *view, const QPointF &surfacePosition) const; virtual bool openUrl(QWaylandClient *client, const QUrl &url); |