diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2018-07-26 15:54:19 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2018-08-07 14:49:37 +0000 |
| commit | 19001dc7c28c750d3dbf0086f5bcac2d11ad592f (patch) | |
| tree | 37323610b5b664d2777fe562fea6a516c2902242 /src/compositor/compositor_api/qwaylandsurface_p.h | |
| parent | a6cfa65eae4d15c7ad5e7411d998332179080fbd (diff) | |
Handle subsurfaces added before QWaylandQuickItem created
This makes gstreamer and Firefox work with QML-based compositors.
Task-number: QTBUG-69643
Change-Id: Iaddaeb7dc3493a262993eecc5ea0b6ce076b4044
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Diffstat (limited to 'src/compositor/compositor_api/qwaylandsurface_p.h')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandsurface_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/compositor/compositor_api/qwaylandsurface_p.h b/src/compositor/compositor_api/qwaylandsurface_p.h index 0cb12d15b..e0b624fce 100644 --- a/src/compositor/compositor_api/qwaylandsurface_p.h +++ b/src/compositor/compositor_api/qwaylandsurface_p.h @@ -163,6 +163,8 @@ public: //member variables QList<QtWayland::FrameCallback *> pendingFrameCallbacks; QList<QtWayland::FrameCallback *> frameCallbacks; + QList<QPointer<QWaylandSurface>> subsurfaceChildren; + QRegion inputRegion; QRegion opaqueRegion; |