Recursive mutex fixes

qgis · Apr 1, 2021 · 6eed7a4 · 6eed7a4
1 parent 615b63e
commit 6eed7a4
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 4 deletions.
diff --git a/src/auth/oauth2/qgsauthoauth2method.h b/src/auth/oauth2/qgsauthoauth2method.h
@@ -114,7 +114,11 @@ class QgsAuthOAuth2Method : public QgsAuthMethod
 
     QgsO2 *authO2( const QString &authcfg );
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
     QMutex mNetworkRequestMutex { QMutex::Recursive };
+#else
+    QRecursiveMutex mNetworkRequestMutex;
+#endif
 };
 
 #endif // QGSAUTHOAUTH2METHOD_H
diff --git a/src/providers/db2/qgsdb2provider.cpp b/src/providers/db2/qgsdb2provider.cpp
@@ -34,7 +34,11 @@ const QString QgsDb2Provider::DB2_PROVIDER_KEY = QStringLiteral( "DB2" );
 const QString QgsDb2Provider::DB2_PROVIDER_DESCRIPTION = QStringLiteral( "DB2 Spatial Extender provider" );
 
 int QgsDb2Provider::sConnectionId = 0;
-QMutex QgsDb2Provider::sMutex{ QMutex::Recursive };
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
+QMutex QgsDb2Provider::sMutex { QMutex::Recursive };
+#else
+QRecursiveMutex QgsDb2Provider::sMutex;
+#endif
 
 QgsDb2Provider::QgsDb2Provider( const QString &uri, const ProviderOptions &options,
                                 QgsDataProvider::ReadFlags flags )

diff --git a/src/providers/db2/qgsdb2provider.h b/src/providers/db2/qgsdb2provider.h
@@ -132,7 +132,11 @@ class QgsDb2Provider final: public QgsVectorDataProvider
        */
     static QString dbConnectionName( const QString &name );
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
     static QMutex sMutex;
+#else
+    static QRecursiveMutex sMutex;
+#endif
 
     QgsFields mAttributeFields; //fields
     QMap<int, QVariant> mDefaultValues;

diff --git a/src/providers/mssql/qgsmssqlconnection.cpp b/src/providers/mssql/qgsmssqlconnection.cpp
@@ -29,7 +29,11 @@
 #include <QFile>
 
 int QgsMssqlConnection::sConnectionId = 0;
-QMutex QgsMssqlConnection::sMutex{ QMutex::Recursive };
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
+QMutex QgsMssqlConnection::sMutex { QMutex::Recursive };
+#else
+QRecursiveMutex QgsMssqlConnection::sMutex;
+#endif
 
 QSqlDatabase QgsMssqlConnection::getDatabase( const QString &service, const QString &host, const QString &database, const QString &username, const QString &password )
 {

diff --git a/src/providers/mssql/qgsmssqlconnection.h b/src/providers/mssql/qgsmssqlconnection.h
@@ -272,7 +272,11 @@ class QgsMssqlConnection
 
     static int sConnectionId;
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
     static QMutex sMutex;
+#else
+    static QRecursiveMutex sMutex;
+#endif
 };
 
 #endif // QGSMSSQLCONNECTION_H
diff --git a/src/providers/postgres/qgspostgresconn.cpp b/src/providers/postgres/qgspostgresconn.cpp
@@ -229,7 +229,6 @@ QgsPostgresConn::QgsPostgresConn( const QString &conninfo, bool readOnly, bool s
   , mNextCursorId( 0 )
   , mShared( shared )
   , mTransaction( transaction )
-  , mLock( QMutex::Recursive )
 {
 
   QgsDebugMsgLevel( QStringLiteral( "New PostgreSQL connection for " ) + conninfo, 2 );

diff --git a/src/providers/postgres/qgspostgresconn.h b/src/providers/postgres/qgspostgresconn.h
@@ -476,7 +476,11 @@ class QgsPostgresConn : public QObject
 
     bool mTransaction;
 
-    mutable QMutex mLock;
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
+    mutable QMutex mLock { QMutex::Recursive };
+#else
+    mutable QRecursiveMutex mLock;
+#endif
 };
 
 // clazy:excludeall=qstring-allocations