diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-24 03:00:47 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-24 03:00:54 +0200 |
| commit | c5f12acd27dee5fdec38b78a02a95cf7debfe9a5 (patch) | |
| tree | 0dbb89ecc77e9401eb3f2200dcbc9f3a6ea9dd68 /src/core/jobs/qthreadpooler.cpp | |
| parent | 4106737900476f9c98325252ec9fedcad602af92 (diff) | |
| parent | 25ecd0881ded8e4f265a4eb01ab775eafcee65d8 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
Diffstat (limited to 'src/core/jobs/qthreadpooler.cpp')
| -rw-r--r-- | src/core/jobs/qthreadpooler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/jobs/qthreadpooler.cpp b/src/core/jobs/qthreadpooler.cpp index 0e9af58dd..a9f4e7a31 100644 --- a/src/core/jobs/qthreadpooler.cpp +++ b/src/core/jobs/qthreadpooler.cpp @@ -183,7 +183,7 @@ int QThreadPooler::currentCount() const { // The caller have to set the mutex - return m_taskCount.load(); + return m_taskCount.loadRelaxed(); } int QThreadPooler::maxThreadCount() const |