diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-15 18:40:58 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-15 18:44:54 +0200 |
| commit | 2be575b4b1e6f6e11a8dbd0b1c05c003828d2598 (patch) | |
| tree | 55d2bfaff9583b3e1e9f3291f4b91f34adae1d92 /src/qml/qml/qqmlmetatype_p.h | |
| parent | 4a5939d26d1e36efdb2b30cdee1f3672587c3fa5 (diff) | |
| parent | 9e32b23a1514f367921b4a9ee25bc864a008463c (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
Change-Id: I6f2152aeecaeb8e63fdbc1cdf1444132a054b6f5
Diffstat (limited to 'src/qml/qml/qqmlmetatype_p.h')
| -rw-r--r-- | src/qml/qml/qqmlmetatype_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlmetatype_p.h b/src/qml/qml/qqmlmetatype_p.h index c2535a7fd5..6c2b0bb2a6 100644 --- a/src/qml/qml/qqmlmetatype_p.h +++ b/src/qml/qml/qqmlmetatype_p.h @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE class QQmlTypeModule; -class QMutex; +class QRecursiveMutex; class QQmlError; namespace QV4 { class ExecutableCompilationUnit; } @@ -160,7 +160,7 @@ public: static void prependCachedUnitLookupFunction(QQmlPrivate::QmlUnitCacheLookupFunction handler); static void removeCachedUnitLookupFunction(QQmlPrivate::QmlUnitCacheLookupFunction handler); - static QMutex *typeRegistrationLock(); + static QRecursiveMutex *typeRegistrationLock(); static QString prettyTypeName(const QObject *object); |