diff options
author | Paul Olav Tvete <paul.tvete@qt.io> | 2020-01-09 15:27:13 +0100 |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@qt.io> | 2020-01-09 15:30:21 +0100 |
commit | d97c657be9d6433d99889aa68e888076a921d70d (patch) | |
tree | 603e86ceaa68b6f3f828e0269b354dd6a57e7baf | |
parent | d5dcd739ccd7464c8c0ebc2fe38e13bfd41edbd7 (diff) | |
parent | 06725b4e10da0420428b3df49046c0ce5ca31b64 (diff) |
Merge "Merge remote-tracking branch 'qt/5.14' into 5.15"
-rw-r--r-- | src/compositor/compositor_api/qwaylandcompositor.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp index 6c23242bd..e6402007e 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.cpp +++ b/src/compositor/compositor_api/qwaylandcompositor.cpp @@ -236,9 +236,12 @@ void QWaylandCompositorPrivate::init() QWaylandCompositorPrivate::~QWaylandCompositorPrivate() { - qDeleteAll(clients); + // Take copies, since the lists will get modified as elements are deleted + const auto clientsToDelete = clients; + qDeleteAll(clientsToDelete); - qDeleteAll(outputs); + const auto outputsToDelete = outputs; + qDeleteAll(outputsToDelete); #if QT_CONFIG(wayland_datadevice) delete data_device_manager; |