diff options
| author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-07-30 12:05:12 +0200 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-28 13:09:41 +0200 |
| commit | ab6980d57609b1e4bdb164d3413faa2f7cb7e1e4 (patch) | |
| tree | ef68f66511347c0545559df6a81b6d56c6448eb4 /src/compositor/compositor_api/qwaylandcompositor.h | |
| parent | e88c2f37097901e228de70c62a0220386038a51a (diff) | |
Move the output from QWaylandSurface to the QWaylandSurfaceView
and add a property called primaryOutput on the QWaylandSurface.
Also add some bookkeeping in QtWayland::Output so it knows what surfaces
and views it currently holds, sending the enter and leave events
automatically.
Change-Id: Ib6efbc6f8157657fb4451b751bba1cb5345b7906
Diffstat (limited to 'src/compositor/compositor_api/qwaylandcompositor.h')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandcompositor.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/compositor/compositor_api/qwaylandcompositor.h b/src/compositor/compositor_api/qwaylandcompositor.h index a203fa265..dd1ce0abd 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.h +++ b/src/compositor/compositor_api/qwaylandcompositor.h @@ -113,17 +113,20 @@ public: QT_DEPRECATED void sendFrameCallbacks(QList<QWaylandSurface *> visibleSurfaces); QT_DEPRECATED QList<QWaylandSurface *> surfacesForClient(QWaylandClient* client) const; - QT_DEPRECATED QList<QWaylandSurface *> surfaces() const; #endif //QT_DEPRECATED_SINCE(5, 5) + QT_DEPRECATED QList<QWaylandSurface *> surfaces() const; + Q_INVOKABLE QList<QWaylandOutput *> outputs() const; Q_INVOKABLE QWaylandOutput *output(QWindow *window); QWaylandOutput *primaryOutput() const; void setPrimaryOutput(QWaylandOutput *output); +#if QT_DEPRECATED_SINCE(5, 5) Q_INVOKABLE virtual QWaylandSurfaceView *pickView(const QPointF &globalPosition) const; Q_INVOKABLE virtual QPointF mapToView(QWaylandSurfaceView *view, const QPointF &surfacePosition) const; +#endif // QT_DEPRECATED_SINCE(5 5) virtual bool openUrl(QWaylandClient *client, const QUrl &url); |