diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-16 03:04:44 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-16 03:04:45 +0100 |
| commit | 26fccd2e63ae82d1883077dfb14b7720b3c93ef1 (patch) | |
| tree | c3964adbebe2f6fced958c8ed839d16148f93cf1 /src/compositor | |
| parent | eabdc86b3a8bc1c94c917166667c3aed57f049f8 (diff) | |
| parent | 4cba9d595311ac6040bf93450d1fb09ec0a3d9f4 (diff) | |
| download | qtwayland-26fccd2e63ae82d1883077dfb14b7720b3c93ef1.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I6d63f7390a3d26ce8c63c8e5de63b673d6831395
Diffstat (limited to 'src/compositor')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandcompositor.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp index 173b50ce..a0d69c52 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.cpp +++ b/src/compositor/compositor_api/qwaylandcompositor.cpp @@ -243,6 +243,9 @@ QWaylandCompositorPrivate::~QWaylandCompositorPrivate() delete data_device_manager; #endif + // Some client buffer integrations need to clean up before the destroying the wl_display + client_buffer_integration.reset(); + wl_display_destroy(display); } |