Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6

This commit is contained in:
Liang Qi 2015-10-02 14:16:52 +00:00 committed by The Qt Project
commit 9c55a359a9

View File

@ -201,6 +201,8 @@ void QWaylandDisplay::blockingReadEvents()
void QWaylandDisplay::exitWithError()
{
mEventThread->quit();
mEventThread->wait();
::exit(1);
}