summaryrefslogtreecommitdiffstats
path: root/src/corelib/thread/qmutex.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/thread/qmutex.cpp')
-rw-r--r--src/corelib/thread/qmutex.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/corelib/thread/qmutex.cpp b/src/corelib/thread/qmutex.cpp
index ee1037d4f4..3815ce16a7 100644
--- a/src/corelib/thread/qmutex.cpp
+++ b/src/corelib/thread/qmutex.cpp
@@ -162,8 +162,9 @@ public:
If \a mode is QMutex::Recursive, a thread can lock the same mutex
multiple times and the mutex won't be unlocked until a
- corresponding number of unlock() calls have been made. The
- default is QMutex::NonRecursive.
+ corresponding number of unlock() calls have been made. Otherwise
+ a thread may only lock a mutex once. The default is
+ QMutex::NonRecursive.
\sa lock(), unlock()
*/
@@ -371,6 +372,13 @@ bool QBasicMutex::isRecursive()
\sa unlock()
*/
+/*!
+ \fn QMutex *QMutexLocker::mutex()
+
+ Returns the mutex on which the QMutexLocker is operating.
+
+*/
+
#ifndef QT_LINUX_FUTEX //linux implementation is in qmutex_linux.cpp
/*