summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/xcb
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@nokia.com>2011-06-06 09:00:13 +0200
committerSamuel Rødal <samuel.rodal@nokia.com>2011-06-06 09:00:13 +0200
commit36b2c31ba8e15109ef984e18f714814ab5a74ec0 (patch)
treeafef7921613c520e8d4dacccda102932a62ac197 /src/plugins/platforms/xcb
parent0ca326917abd84f5972fd70255e234d86c3deeed (diff)
Make XCB plugin work better in combination with auto-tests.
When an auto-test calls processEvents() indirectly via QTest::qWait(), QAbstractEventDispatcher::aboutToBlock() doesn't get emitted since the processEvents() implementation gets called without the QEventLoop::WaitForMoreEvents flag set. Since the auto-tests depend on all events getting delivered, we need to process the XCB events on awake() as well.
Diffstat (limited to 'src/plugins/platforms/xcb')
-rw-r--r--src/plugins/platforms/xcb/qxcbconnection.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp
index 1655378037..1d7611533a 100644
--- a/src/plugins/platforms/xcb/qxcbconnection.cpp
+++ b/src/plugins/platforms/xcb/qxcbconnection.cpp
@@ -128,6 +128,7 @@ QXcbConnection::QXcbConnection(const char *displayName)
QAbstractEventDispatcher *dispatcher = QAbstractEventDispatcher::instance(qApp->thread());
connect(dispatcher, SIGNAL(aboutToBlock()), this, SLOT(processXcbEvents()));
+ connect(dispatcher, SIGNAL(awake()), this, SLOT(processXcbEvents()));
sync();
}