diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2023-12-17 11:52:36 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-01-09 23:25:03 +0000 |
| commit | 5b142ede13fd0ae2182082d952cc2fc163567446 (patch) | |
| tree | 19ab589c66f9d962b0f64f7a1b8cc537424e5f2e | |
| parent | abbbcb3f149418b945f6cddf24d90cc7fb091da8 (diff) | |
ExecutableAllocator: Use non-recursive mutex again
Amends/parially reverts 4bac72aa13e6818460f6b71127d3af5bd7e00ca5, which
replaced recursive Qt5 mutexes with QRecursiveMutex – but
ExecutableAllocator used QMutex::NonRecursive, so this instance was
misguided.
Change-Id: I33fd9e903b8861a7907bc8bde7632045198ef5c7
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit 63a635d9237be5bc4445727ba772527066daaf70)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 5d6c8c2f391a39180e2664cf1ee1e39edbe7cff6)
| -rw-r--r-- | src/qml/jsruntime/qv4executableallocator_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4executableallocator_p.h b/src/qml/jsruntime/qv4executableallocator_p.h index 2f97c9ae6e..8181bf17ae 100644 --- a/src/qml/jsruntime/qv4executableallocator_p.h +++ b/src/qml/jsruntime/qv4executableallocator_p.h @@ -100,7 +100,7 @@ public: private: QMultiMap<size_t, Allocation*> freeAllocations; QMap<quintptr, ChunkOfPages*> chunks; - mutable QRecursiveMutex mutex; + mutable QMutex mutex; }; } |