summaryrefslogtreecommitdiffstats
path: root/src/core/qchangearbiter_p.h
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2019-06-28 12:13:57 +0200
committerMarc Mutz <marc.mutz@kdab.com>2019-07-31 11:47:10 +0200
commit9a7fc48ba656ef2ba5c5f43926346a7af417d121 (patch)
treefec9543e7bf7bc0b9eb70a6f96c69a2076f70c3f /src/core/qchangearbiter_p.h
parent238ea650cc711668b4c55fe5f208fba31da98b57 (diff)
Port from QMutex::Recursive to QRecursiveMutex
Also port from QMutexLocker to std::lock_guard, as the former will not support QRecursiveMutex going forward. Change-Id: I65e14492fc0583e5d0018aef64e18db8a6023dc8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/core/qchangearbiter_p.h')
-rw-r--r--src/core/qchangearbiter_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/qchangearbiter_p.h b/src/core/qchangearbiter_p.h
index ac52273ea..1f453ff56 100644
--- a/src/core/qchangearbiter_p.h
+++ b/src/core/qchangearbiter_p.h
@@ -137,7 +137,7 @@ protected:
void removeLockingChangeQueue(QChangeQueue *queue);
private:
- mutable QMutex m_mutex;
+ mutable QRecursiveMutex m_mutex;
QAbstractAspectJobManager *m_jobManager;
// The lists of observers indexed by observable (QNodeId).