From aadf64f08486766bb6d40bcaae47e9b4d6411c28 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Thu, 27 Jun 2019 19:01:31 +0200
Subject: [PATCH] QtGui: port from QMutex::Recursive to QRecursiveMutex

Change-Id: I1ce4fcfa1bfb9a89fe3ebe61d049b9b3100fd700
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/gui/kernel/qopenglcontext.cpp | 3 +--
 src/gui/kernel/qopenglcontext_p.h | 5 ++---
 src/gui/text/qfont.cpp            | 2 +-
 src/gui/text/qfontdatabase.cpp    | 6 +++---
 src/gui/util/qdesktopservices.cpp | 4 ++--
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/gui/kernel/qopenglcontext.cpp b/src/gui/kernel/qopenglcontext.cpp
index a3b2ea5f86..326d2823eb 100644
--- a/src/gui/kernel/qopenglcontext.cpp
+++ b/src/gui/kernel/qopenglcontext.cpp
@@ -1610,8 +1610,7 @@ void QOpenGLSharedResourceGuard::freeResource(QOpenGLContext *context)
     QOpenGLMultiGroupSharedResource instance.
 */
 QOpenGLMultiGroupSharedResource::QOpenGLMultiGroupSharedResource()
-    : active(0),
-      m_mutex(QMutex::Recursive)
+    : active(0)
 {
 #ifdef QT_GL_CONTEXT_RESOURCE_DEBUG
     qDebug("Creating context group resource object %p.", this);
diff --git a/src/gui/kernel/qopenglcontext_p.h b/src/gui/kernel/qopenglcontext_p.h
index c6ad893ee6..833cfb20c3 100644
--- a/src/gui/kernel/qopenglcontext_p.h
+++ b/src/gui/kernel/qopenglcontext_p.h
@@ -132,7 +132,6 @@ class Q_GUI_EXPORT QOpenGLContextGroupPrivate : public QObjectPrivate
 public:
     QOpenGLContextGroupPrivate()
         : m_context(nullptr)
-        , m_mutex(QMutex::Recursive)
         , m_refs(0)
     {
     }
@@ -147,7 +146,7 @@ public:
     QOpenGLContext *m_context;
 
     QList<QOpenGLContext *> m_shares;
-    QMutex m_mutex;
+    QRecursiveMutex m_mutex;
 
     QHash<QOpenGLMultiGroupSharedResource *, QOpenGLSharedResource *> m_resources;
     QAtomicInt m_refs;
@@ -186,7 +185,7 @@ public:
 private:
     QAtomicInt active;
     QList<QOpenGLContextGroup *> m_groups;
-    QMutex m_mutex;
+    QRecursiveMutex m_mutex;
 };
 
 class QPaintEngineEx;
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index 2a1d207702..97e73f0723 100644
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
@@ -208,7 +208,7 @@ QFontPrivate::~QFontPrivate()
     scFont = 0;
 }
 
-extern QMutex *qt_fontdatabase_mutex();
+extern QRecursiveMutex *qt_fontdatabase_mutex();
 
 #define QT_FONT_ENGINE_FROM_DATA(data, script) data->engines[script]
 
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index 562ee3e2b1..ce6bb0c347 100644
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -705,7 +705,7 @@ static QStringList familyList(const QFontDef &req)
 }
 
 Q_GLOBAL_STATIC(QFontDatabasePrivate, privateDb)
-Q_GLOBAL_STATIC_WITH_ARGS(QMutex, fontDatabaseMutex, (QMutex::Recursive))
+Q_GLOBAL_STATIC(QRecursiveMutex, fontDatabaseMutex)
 
 // used in qguiapplication.cpp
 void qt_cleanupFontDatabase()
@@ -717,8 +717,8 @@ void qt_cleanupFontDatabase()
     }
 }
 
-// used in qfontengine_x11.cpp
-QMutex *qt_fontdatabase_mutex()
+// used in qfont.cpp
+QRecursiveMutex *qt_fontdatabase_mutex()
 {
     return fontDatabaseMutex();
 }
diff --git a/src/gui/util/qdesktopservices.cpp b/src/gui/util/qdesktopservices.cpp
index 8c7cf8682c..ee0ff4c6ef 100644
--- a/src/gui/util/qdesktopservices.cpp
+++ b/src/gui/util/qdesktopservices.cpp
@@ -60,9 +60,9 @@ class QOpenUrlHandlerRegistry : public QObject
 {
     Q_OBJECT
 public:
-    inline QOpenUrlHandlerRegistry() : mutex(QMutex::Recursive) {}
+    QOpenUrlHandlerRegistry() = default;
 
-    QMutex mutex;
+    QRecursiveMutex mutex;
 
     struct Handler
     {