diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-06-26 11:32:55 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-06-26 11:33:19 +0200 |
| commit | 7810209ba32fcebfa90b081670595daaa5333a78 (patch) | |
| tree | 98410d5cc7d9d762bbde0cb4eae8041aa6e2e542 /src/corelib/thread/qmutexpool_p.h | |
| parent | 6f2eabb54e3f827ebd2b90f68144b86342933869 (diff) | |
| parent | 88625709058b386ee74cca536c6c5556159c99fa (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/qt6
Change-Id: I4ea2b77cc201daed94fbe321f146dfd20365a534
Diffstat (limited to 'src/corelib/thread/qmutexpool_p.h')
| -rw-r--r-- | src/corelib/thread/qmutexpool_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/thread/qmutexpool_p.h b/src/corelib/thread/qmutexpool_p.h index 89d006ac29..1a47231abc 100644 --- a/src/corelib/thread/qmutexpool_p.h +++ b/src/corelib/thread/qmutexpool_p.h @@ -68,7 +68,7 @@ public: inline QMutex *get(const void *address) { int index = uint(quintptr(address)) % mutexes.count(); - QMutex *m = mutexes[index].load(); + QMutex *m = mutexes[index].loadRelaxed(); if (m) return m; else |