From cd113d0dcb5e6ff71300ed67af5e296dc6f5dccf Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Thu, 27 Jun 2019 15:47:16 +0200
Subject: Port some trivial cases from QMutex to QRecursiveMutex

In all of these cases, the effect of the change is local to one file.

Change-Id: I3bda3aadee3b42e7797183c2330183390b92d1f2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/io/qresource.cpp                                  | 4 ++--
 src/corelib/kernel/qcoreapplication.cpp                       | 2 +-
 src/corelib/plugin/qfactoryloader.cpp                         | 2 +-
 src/opengl/qgl.cpp                                            | 7 +------
 src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h | 4 ++--
 src/plugins/platforms/android/androidjnimenu.cpp              | 4 ++--
 6 files changed, 9 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp
index d143f7fda3..fcc5b69179 100644
--- a/src/corelib/io/qresource.cpp
+++ b/src/corelib/io/qresource.cpp
@@ -197,13 +197,13 @@ Q_DECLARE_TYPEINFO(QResourceRoot, Q_MOVABLE_TYPE);
 typedef QList<QResourceRoot*> ResourceList;
 struct QResourceGlobalData
 {
-    QMutex resourceMutex{QMutex::Recursive};
+    QRecursiveMutex resourceMutex;
     ResourceList resourceList;
     QStringList resourceSearchPaths;
 };
 Q_GLOBAL_STATIC(QResourceGlobalData, resourceGlobalData)
 
-static inline QMutex *resourceMutex()
+static inline QRecursiveMutex *resourceMutex()
 { return &resourceGlobalData->resourceMutex; }
 
 static inline ResourceList *resourceList()
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index 9d8da70e47..87dae896fa 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -2657,7 +2657,7 @@ QString QCoreApplication::applicationVersion()
 
 #if QT_CONFIG(library)
 
-Q_GLOBAL_STATIC_WITH_ARGS(QMutex, libraryPathMutex, (QMutex::Recursive))
+Q_GLOBAL_STATIC(QRecursiveMutex, libraryPathMutex)
 
 /*!
     Returns a list of paths that the application will search when
diff --git a/src/corelib/plugin/qfactoryloader.cpp b/src/corelib/plugin/qfactoryloader.cpp
index 8e349f23ce..6737aeccd2 100644
--- a/src/corelib/plugin/qfactoryloader.cpp
+++ b/src/corelib/plugin/qfactoryloader.cpp
@@ -170,7 +170,7 @@ public:
 
 Q_GLOBAL_STATIC(QList<QFactoryLoader *>, qt_factory_loaders)
 
-Q_GLOBAL_STATIC_WITH_ARGS(QMutex, qt_factoryloader_mutex, (QMutex::Recursive))
+Q_GLOBAL_STATIC(QRecursiveMutex, qt_factoryloader_mutex)
 
 QFactoryLoaderPrivate::~QFactoryLoaderPrivate()
 {
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 2b4af3ef9f..2c5a40a992 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -1667,11 +1667,6 @@ bool operator!=(const QGLFormat& a, const QGLFormat& b)
 }
 
 struct QGLContextGroupList {
-    QGLContextGroupList()
-        : m_mutex(QMutex::Recursive)
-    {
-    }
-
     void append(QGLContextGroup *group) {
         QMutexLocker locker(&m_mutex);
         m_list.append(group);
@@ -1683,7 +1678,7 @@ struct QGLContextGroupList {
     }
 
     QList<QGLContextGroup *> m_list;
-    QMutex m_mutex;
+    QRecursiveMutex m_mutex;
 };
 
 Q_GLOBAL_STATIC(QGLContextGroupList, qt_context_groups)
diff --git a/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h b/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h
index 2d1d5e6572..2765db2946 100644
--- a/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h
+++ b/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h
@@ -116,11 +116,11 @@ private:
     friend class QFontEngineFT;
     friend class QtFreetypeData;
     friend struct QScopedPointerDeleter<QFreetypeFace>;
-    QFreetypeFace() : _lock(QMutex::Recursive) {}
+    QFreetypeFace() = default;
     ~QFreetypeFace() {}
     void cleanup();
     QAtomicInt ref;
-    QMutex _lock;
+    QRecursiveMutex _lock;
     QByteArray fontData;
 
     QFontEngine::Holder hbFace;
diff --git a/src/plugins/platforms/android/androidjnimenu.cpp b/src/plugins/platforms/android/androidjnimenu.cpp
index 6f548aba52..f51a3920b8 100644
--- a/src/plugins/platforms/android/androidjnimenu.cpp
+++ b/src/plugins/platforms/android/androidjnimenu.cpp
@@ -60,12 +60,12 @@ namespace QtAndroidMenu
 {
     static QList<QAndroidPlatformMenu *> pendingContextMenus;
     static QAndroidPlatformMenu *visibleMenu = 0;
-    static QMutex visibleMenuMutex(QMutex::Recursive);
+    static QRecursiveMutex visibleMenuMutex;
 
     static QSet<QAndroidPlatformMenuBar *> menuBars;
     static QAndroidPlatformMenuBar *visibleMenuBar = 0;
     static QWindow *activeTopLevelWindow = 0;
-    static QMutex menuBarMutex(QMutex::Recursive);
+    static QRecursiveMutex menuBarMutex;
 
     static jmethodID openContextMenuMethodID = 0;
 
-- 
cgit v1.2.3