diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2019-06-28 10:58:17 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2019-07-31 16:10:19 +0200 |
| commit | 4bac72aa13e6818460f6b71127d3af5bd7e00ca5 (patch) | |
| tree | 840c7874d6c4ab695ed80381d9071feec7fd497b /src/qml/qml/qqmlmetatype.cpp | |
| parent | 1d9645576eab6cc316c7772b4f4b2c05f37e6ec2 (diff) | |
Port from QMutex::Recursive to QRecursiveMutex
Change-Id: I5bf128b4479971e87d377707f2ebf267ccba1f1d
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlmetatype.cpp')
| -rw-r--r-- | src/qml/qml/qqmlmetatype.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlmetatype.cpp b/src/qml/qml/qqmlmetatype.cpp index f21427ff69..2c641d3845 100644 --- a/src/qml/qml/qqmlmetatype.cpp +++ b/src/qml/qml/qqmlmetatype.cpp @@ -60,7 +60,7 @@ struct LockedData : private QQmlMetaTypeData }; Q_GLOBAL_STATIC(LockedData, metaTypeData) -Q_GLOBAL_STATIC_WITH_ARGS(QMutex, metaTypeDataLock, (QMutex::Recursive)) +Q_GLOBAL_STATIC(QRecursiveMutex, metaTypeDataLock) class QQmlMetaTypeDataPtr { @@ -804,7 +804,7 @@ QQmlType QQmlMetaType::typeForUrl(const QString &urlString, return QQmlType(); } -QMutex *QQmlMetaType::typeRegistrationLock() +QRecursiveMutex *QQmlMetaType::typeRegistrationLock() { return metaTypeDataLock(); } |