diff options
| author | Mika Salmela <mika.salmela@theqtcompany.com> | 2015-05-27 15:53:20 +0300 |
|---|---|---|
| committer | Mika Salmela <mika.salmela@theqtcompany.com> | 2015-05-27 13:01:18 +0000 |
| commit | bc3e46b02f345d86010a154326dcce475dc1c25e (patch) | |
| tree | fac6e5200b7ab7a3339802708023522d8af6dedb /src/core | |
| parent | 90b22d995ff7a05956b7549003a88ebf11f5d588 (diff) | |
Add mutex to QThreadPooler destructor
Added mutex to QThreadPooler destructor to wait that mutex is not
destroyed while locked. This seems to be important for autotests.
Change-Id: I5423344ecd2c24e896adaf5b9b52309200ed8801
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/jobs/qthreadpooler.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/jobs/qthreadpooler.cpp b/src/core/jobs/qthreadpooler.cpp index b5d7ba10b..5e1c2749d 100644 --- a/src/core/jobs/qthreadpooler.cpp +++ b/src/core/jobs/qthreadpooler.cpp @@ -58,6 +58,10 @@ QThreadPooler::QThreadPooler(QObject *parent) QThreadPooler::~QThreadPooler() { + // Wait till all tasks are finished before deleting mutex + QMutexLocker locker(m_mutex); + locker.unlock(); + delete m_mutex; } |