Merge pull request #43209 from zy6p/patch-qt6-qmutex

[qt6] Use RecursiveMutex instead of QMutex in QgsSpatialIndexData
qgis · May 15, 2021 · 8abb178 · 8abb178
2 parents a701fe6 + 9e3f95e
commit 8abb178
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/core/qgsspatialindex.cpp b/src/core/qgsspatialindex.cpp
@@ -329,7 +329,11 @@ class QgsSpatialIndexData : public QSharedData
     //! R-tree containing spatial index
     SpatialIndex::ISpatialIndex *mRTree = nullptr;
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
     mutable QMutex mMutex;
+#else
+    mutable QRecursiveMutex mMutex;
+#endif
 
 };