diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-04 09:40:18 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-04 09:40:18 +0100 |
| commit | 859d6654ef030494647147046778f4206c04d7f6 (patch) | |
| tree | bafbbdaf0b1d4948e688a29e855c15331dcc3ff7 /src/compositor/compositor_api/qwaylandquickitem_p.h | |
| parent | dccec9b282ae15fa65fd61698dd1cb47325e5c8e (diff) | |
| parent | 9ce3088d226fddc18bcac170fa5cc5be3c29e371 (diff) | |
Merge remote-tracking branch 'origin/5.11.3' into 5.11
Change-Id: I16cf098f93e76de8437963fd41be4a5605101cb9
Diffstat (limited to 'src/compositor/compositor_api/qwaylandquickitem_p.h')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandquickitem_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compositor/compositor_api/qwaylandquickitem_p.h b/src/compositor/compositor_api/qwaylandquickitem_p.h index f926d55e8..28b8732d3 100644 --- a/src/compositor/compositor_api/qwaylandquickitem_p.h +++ b/src/compositor/compositor_api/qwaylandquickitem_p.h @@ -154,7 +154,7 @@ public: static QMutex *mutex; QScopedPointer<QWaylandView> view; - QWaylandSurface *oldSurface = nullptr; + QPointer<QWaylandSurface> oldSurface; mutable QWaylandSurfaceTextureProvider *provider = nullptr; bool paintEnabled = true; bool touchEventsEnabled = true; |