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

Merge remote-tracking branch 'origin/5.5' into 5.6

Browse Source 
Change-Id: Ib3c5bec85a09d92e37a3af8e1c749a80cb40c056
This commit is contained in:
Liang Qi 2015-10-02 13:50:24 +02:00
commit 2638cae03d
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);
} }