path: root/src/tools
diff options
authorLars Knoll <>2020-09-04 15:35:16 +0200
committerLars Knoll <>2020-10-17 12:02:56 +0200
commitd4b206b246caf9b49110526585693ab629609d99 (patch)
tree1149ccd1e50f2e5cda8dcfba09c3e3bdcfb2a2a3 /src/tools
parent77d812683f0ad595606f9833613dd49bb2fda26d (diff)
Split QMutex and QRecursiveMutex
These classes should not inherit from each other anymore in Qt 6. The reason is that this makes the 95% case of using a non-recursive mutex much slower than it has to be. This way, QMutex can now inline the fast path and be pretty much as fast as QBasicMutex is in Qt 5. They actually use the same code paths now. The main difference is that QMutex allows calling tryLock() with a timeout, which that is not allowed for QBasicMutex. [ChangeLog][QtCore][QMutex] QMutex does not support recursive locking anymore. Use QRecursiveMutex for that purpose. QRecursiveMutex does not inherit QMutex anymore in Qt 6. Change-Id: I10f9bab6269a9181a2e9f534fb72ce65bc76d989 Reviewed-by: Volker Hilsheimer <> Reviewed-by: Thiago Macieira <>
Diffstat (limited to 'src/tools')
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/uic/qclass_lib_map.h b/src/tools/uic/qclass_lib_map.h
index 5e11d61089..5ec4ff9093 100644
--- a/src/tools/uic/qclass_lib_map.h
+++ b/src/tools/uic/qclass_lib_map.h
@@ -134,7 +134,7 @@ QT_CLASS_LIB(QBasicAtomicInt, QtCore, qbasicatomic.h)
QT_CLASS_LIB(QBasicAtomicPointer, QtCore, qbasicatomic.h)
QT_CLASS_LIB(QMutex, QtCore, qmutex.h)
QT_CLASS_LIB(QMutexLocker, QtCore, qmutex.h)
-QT_CLASS_LIB(QMutexData, QtCore, qmutex.h)
+QT_CLASS_LIB(QMutexPrivate, QtCore, qmutex.h)
QT_CLASS_LIB(QMutex, QtCore, qmutex.h)
QT_CLASS_LIB(QMutexLocker, QtCore, qmutex.h)
QT_CLASS_LIB(QReadWriteLock, QtCore, qreadwritelock.h)