Using QMutex in recursive mode is deprecated.

autotests/server/fakeclient.cpp

@@ -37,7 +37,7 @@ using namespace Akonadi::Server;
 
 FakeClient::FakeClient(QObject *parent)
     : QThread(parent)
-    , mMutex(QMutex::Recursive)
+    , mMutex()
 {
     moveToThread(this);
 }

autotests/server/fakeclient.h

@@ -9,7 +9,7 @@
 #define AKONADI_SERVER_FAKECLIENT_H
 
 #include <QThread>
-#include <QMutex>
+#include <QRecursiveMutex>
 #include "datastream_p_p.h"
 
 #include "fakeakonadiserver.h"
@@ -41,7 +41,7 @@ private Q_SLOTS:
     void connectionLost();
 
 private:
-    mutable QMutex mMutex;
+    mutable QRecursiveMutex mMutex;
 
     TestScenario::List mScenarios;
     QLocalSocket *mSocket = nullptr;

src/server/aggregatedfetchscope.cpp

@@ -7,7 +7,7 @@
 #include "aggregatedfetchscope.h"
 #include <shared/akranges.h>
 
-#include <QMutex>
+#include <QRecursiveMutex>
 #include <QMutexLocker>
 
 #define LOCKED_D(name) \
@@ -22,7 +22,7 @@ class AggregatedFetchScopePrivate
 {
 public:
     AggregatedFetchScopePrivate()
-        : lock(QMutex::Recursive) // recursive so that we can call our own getters/setters
+        : lock() // recursive so that we can call our own getters/setters
     {}
 
     inline void addToSet(const QByteArray &value, QSet<QByteArray> &set, QHash<QByteArray, int> &count)
@@ -67,7 +67,7 @@ public:
     }
 
 public:
-    mutable QMutex lock;
+    mutable QRecursiveMutex lock;
 };
 
 class AggregatedCollectionFetchScopePrivate : public AggregatedFetchScopePrivate