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

Change-Id: Ib3c5bec85a09d92e37a3af8e1c749a80cb40c056
2015-10-02 13:50:24 +02:00 · 2015-10-02 13:50:24 +02:00 · 2638cae03d
commit 2638cae03d
parent b975ab4b85 a7ed723edb
1 changed files with 2 additions and 0 deletions
--- a/src/plugins/platforms/wayland/qwaylanddisplay.cpp
+++ b/src/plugins/platforms/wayland/qwaylanddisplay.cpp
@ -201,6 +201,8 @@ void QWaylandDisplay::blockingReadEvents()

 void QWaylandDisplay::exitWithError()
 {
+    mEventThread->quit();
+    mEventThread->wait();
    ::exit(1);
 }