1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix QMutex documentation saying some function are static while they are not

Browse Source 
qdoc only see a fake QMutex class (the same as the one built in bootstrap)
But that fake QMutex had static member while the normal QMutex class
has non static member.

QMutexLocker::mutex is also a const function in the real QMutexLocker

Task-number: QTBUG-38522
Change-Id: I220434ffc6a9e990029f770e2536ecb55b4e2182
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
This commit is contained in:
Olivier Goffart 2014-06-26 12:46:57 +02:00
parent dee557c8aa
commit 321d6dda75
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/thread/qmutex.cpp
View File

@ -380,7 +380,7 @@ bool QBasicMutex::isRecursive()
*/ */
/*! /*!
\fn QMutex *QMutexLocker::mutex() \fn QMutex *QMutexLocker::mutex() const
Returns the mutex on which the QMutexLocker is operating. Returns the mutex on which the QMutexLocker is operating.

14
src/corelib/thread/qmutex.h
View File

@ -186,10 +186,10 @@ public:
inline explicit QMutex(RecursionMode mode = NonRecursive) { Q_UNUSED(mode); } inline explicit QMutex(RecursionMode mode = NonRecursive) { Q_UNUSED(mode); }
static inline void lock() {} inline void lock() {}
static inline bool tryLock(int timeout = 0) { Q_UNUSED(timeout); return true; } inline bool tryLock(int timeout = 0) { Q_UNUSED(timeout); return true; }
static inline void unlock() {} inline void unlock() {}
static inline bool isRecursive() { return true; } inline bool isRecursive() { return true; }
private: private:
Q_DISABLE_COPY(QMutex) Q_DISABLE_COPY(QMutex)
@ -201,9 +201,9 @@ public:
inline explicit QMutexLocker(QMutex *) {} inline explicit QMutexLocker(QMutex *) {}
inline ~QMutexLocker() {} inline ~QMutexLocker() {}
static inline void unlock() {} inline void unlock() {}
static void relock() {} void relock() {}
static inline QMutex *mutex() { return 0; } inline QMutex *mutex() const { return 0; }
private: private:
Q_DISABLE_COPY(QMutexLocker) Q_DISABLE_COPY(QMutexLocker)