diff options
| author | Michele Caini <michele.caini@gmail.com> | 2012-10-08 22:34:39 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-13 15:47:27 +0200 |
| commit | ac8cab0cabb54815c315b7b19f531901a887f402 (patch) | |
| tree | 4dcf6385ecfe8c140248b1de961671a62c8cee2b /src/corelib/thread | |
| parent | e3a89dafb0671fe328d14f7bb658b11be83289db (diff) | |
Review of documentation.
Documentation has been updated, changes apply to Qt5 as well as Qt4.
Change-Id: I562914a439d8d27dc9e6b1aa117007edce214cc6
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Diffstat (limited to 'src/corelib/thread')
| -rw-r--r-- | src/corelib/thread/qmutex.cpp | 12 |
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 /* |