diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-09 16:20:22 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-10 21:49:32 +0200 |
| commit | 9e32b23a1514f367921b4a9ee25bc864a008463c (patch) | |
| tree | d835ba67426e12e51dc1028e8ebac9087a3d43b0 /src/qml/jsruntime/qv4executableallocator_p.h | |
| parent | cb37a1d0c3fce7951f5d7f1fb4a04f90e038f01b (diff) | |
| parent | 36990a732eab2dc16bee89715662f6d3d8b3a0cd (diff) | |
Merge "Merge remote-tracking branch 'origin/dev' into wip/qt6"
Diffstat (limited to 'src/qml/jsruntime/qv4executableallocator_p.h')
| -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 013c6d7120..f98f2c7d33 100644 --- a/src/qml/jsruntime/qv4executableallocator_p.h +++ b/src/qml/jsruntime/qv4executableallocator_p.h @@ -130,7 +130,7 @@ public: private: QMultiMap<size_t, Allocation*> freeAllocations; QMap<quintptr, ChunkOfPages*> chunks; - mutable QMutex mutex; + mutable QRecursiveMutex mutex; }; } |