From ac8cab0cabb54815c315b7b19f531901a887f402 Mon Sep 17 00:00:00 2001 From: Michele Caini Date: Mon, 8 Oct 2012 22:34:39 +0200 Subject: Review of documentation. Documentation has been updated, changes apply to Qt5 as well as Qt4. Change-Id: I562914a439d8d27dc9e6b1aa117007edce214cc6 Reviewed-by: Joerg Bornemann Reviewed-by: Frederik Gladhorn --- src/corelib/thread/qmutex.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/corelib/thread/qmutex.cpp') 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 /* -- cgit v1.2.3