Fix deadlock in the fsevents file watcher.

I was making an assumption that one could call CFRunLoopStop and expect
that the runloop would stop very soon afterwards. This is a bit naive
and can result in situations where we end up running past and entering
run again before everything is finished. We now make sure that we don't
leave stop() until the we really have stopped the other thread.

Reviewed-by: mbm

1 files changed, 1 insertions, 0 deletions

diff --git a/src/corelib/io/qfilesystemwatcher_fsevents_p.h b/src/corelib/io/qfilesystemwatcher_fsevents_p.h
index 4770867258..ffc0c687f9 100644
--- a/src/corelib/io/qfilesystemwatcher_fsevents_p.h
+++ b/src/corelib/io/qfilesystemwatcher_fsevents_p.h
@@ -114,6 +114,7 @@ private:
     CFRunLoopRef threadsRunLoop;
     QMutex mutex;
     QWaitCondition waitCondition;
+    QWaitCondition waitForStop;
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
     PathHash filePathInfoHash;
     PathHash dirPathInfoHash;