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

 Conflicts:
	configure.pri

Also required s/solid\.color/solidColor/ in a couple of places in:
	src/gui/painting/qpaintengine_raster.cpp

Change-Id: I29937f63e9779deb6dac7ae77e2948d06ebc0319

1 files changed, 7 insertions, 2 deletions

diff --git a/src/plugins/platforms/xcb/qxcbeventqueue.cpp b/src/plugins/platforms/xcb/qxcbeventqueue.cpp
index 82a36c0727..759ee3cc95 100644
--- a/src/plugins/platforms/xcb/qxcbeventqueue.cpp
+++ b/src/plugins/platforms/xcb/qxcbeventqueue.cpp
@@ -226,11 +226,13 @@ void QXcbEventQueue::run()
     };
 
     while (!m_closeConnectionDetected && (event = xcb_wait_for_event(connection))) {
+        m_newEventsMutex.lock();
         enqueueEvent(event);
         while (!m_closeConnectionDetected && (event = xcb_poll_for_queued_event(connection)))
             enqueueEvent(event);
 
         m_newEventsCondition.wakeOne();
+        m_newEventsMutex.unlock();
         wakeUpDispatcher();
     }
 
@@ -350,9 +352,12 @@ bool QXcbEventQueue::peekEventQueue(PeekerCallback peeker, void *peekerData,
 
 void QXcbEventQueue::waitForNewEvents(unsigned long time)
 {
-    m_newEventsMutex.lock();
+    QMutexLocker locker(&m_newEventsMutex);
+    QXcbEventNode *tailBeforeFlush = m_flushedTail;
+    flushBufferedEvents();
+    if (tailBeforeFlush != m_flushedTail)
+        return;
     m_newEventsCondition.wait(&m_newEventsMutex, time);
-    m_newEventsMutex.unlock();
 }
 
 void QXcbEventQueue::sendCloseConnectionEvent() const