1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Liang Qi 2015-10-02 14:16:52 +00:00 committed by The Qt Project
commit 9c55a359a9
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/wayland/qwaylanddisplay.cpp
View File

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