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:27:13 +0100 |
commit | 06725b4e10da0420428b3df49046c0ce5ca31b64 (patch) | |
tree | ba26ec6d912f626e33912656c17e6602cf823f86 | |
parent | c1f6942c6b2318a73ae1424be02e442c7c5cd292 (diff) | |
parent | 5ed697cda35fe300d2cb828370aaee489a0f9317 (diff) | |
download | qtwayland-06725b4e10da0420428b3df49046c0ce5ca31b64.tar.gz |
Merge remote-tracking branch 'qt/5.14' into 5.15
Change-Id: I21c6a0a4bc8df8dcaf9e33647482ba43c7b7d6c4
-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 6c23242b..e6402007 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; |