AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QtGui: port from QMutex::Recursive to QRecursiveMutex

Browse Source 
Change-Id: I1ce4fcfa1bfb9a89fe3ebe61d049b9b3100fd700
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Marc Mutz 2019-06-27 19:01:31 +02:00
parent 5de9dedbc7
commit aadf64f084
5 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/kernel/qopenglcontext.cpp
View File

@ -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);

5
src/gui/kernel/qopenglcontext_p.h
View File

@ -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;

2
src/gui/text/qfont.cpp
View File

@ -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]

6
src/gui/text/qfontdatabase.cpp
View File

@ -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();
}

4
src/gui/util/qdesktopservices.cpp
View File

@ -60,9 +60,9 @@ class QOpenUrlHandlerRegistry : public QObject
{
Q_OBJECT
public:
inline QOpenUrlHandlerRegistry() : mutex(QMutex::Recursive) {}
QOpenUrlHandlerRegistry() = default;
QMutex mutex;
QRecursiveMutex mutex;
struct Handler
{