summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@nokia.com>2011-03-30 14:05:10 (GMT)
committerSamuel Rødal <samuel.rodal@nokia.com>2011-03-30 14:06:03 (GMT)
commit3cad0744477da31ab59ffb6d3baa498a369d5089 (patch)
treec8163b18ea22968ba11556632d791e20d16573bf
parent973cd5be8a980a6cb57dc719b05e4b99f8e6d3e2 (diff)
downloadQt-3cad0744477da31ab59ffb6d3baa498a369d5089.zip
Qt-3cad0744477da31ab59ffb6d3baa498a369d5089.tar.gz
Qt-3cad0744477da31ab59ffb6d3baa498a369d5089.tar.bz2
Prevent dead-lock when quitting XCB application.
Make sure event processing is enabled when we close the connection.
-rw-r--r--src/plugins/platforms/xcb/qxcbconnection.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp
index 22149f0..f1d3d2b 100644
--- a/src/plugins/platforms/xcb/qxcbconnection.cpp
+++ b/src/plugins/platforms/xcb/qxcbconnection.cpp
@@ -163,6 +163,8 @@ void QXcbConnection::setEventProcessingEnabled(bool enabled)
QXcbConnection::~QXcbConnection()
{
+ setEventProcessingEnabled(true);
+
sendConnectionEvent(QXcbAtom::_QT_CLOSE_CONNECTION);
wait();