Merge remote-tracking branch 'origin/5.12' into dev

 Conflicts:
	src/gui/painting/qdrawhelper.cpp

Change-Id: I4916e07b635e1d3830e9b46ef7914f99bec3098e

1 files changed, 4 insertions, 1 deletions

diff --git a/src/plugins/platforms/xcb/qxcbeventqueue.cpp b/src/plugins/platforms/xcb/qxcbeventqueue.cpp
index 883268b083..527bca26a8 100644
--- a/src/plugins/platforms/xcb/qxcbeventqueue.cpp
+++ b/src/plugins/platforms/xcb/qxcbeventqueue.cpp
@@ -105,7 +105,8 @@ QXcbEventQueue::~QXcbEventQueue()
         wait();
     }
 
-    while (xcb_generic_event_t *event = takeFirst())
+    flushBufferedEvents();
+    while (xcb_generic_event_t *event = takeFirst(QEventLoop::AllEvents))
         free(event);
 
     if (m_head && m_head->fromHeap)
@@ -219,6 +220,8 @@ void QXcbEventQueue::run()
             tail->next = qXcbEventNodeFactory(event);
             tail = tail->next;
             m_tail.store(tail, std::memory_order_release);
+        } else {
+            free(event);
         }
     };