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

doc: Correct remaining qdoc warnings in qmutex.cpp

Browse Source 
clang required adding template clauses to a few \fn commands.
|| defined(Q_CLANG_QDOC) was also added in qmutex.h.

Change-Id: I7e61f460a8f8f15032094fb35c02f73721a5eb8a
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
This commit is contained in:
Martin Smith 2018-01-03 13:21:57 +01:00
parent 9e005c9401
commit 58a47ccfe5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -276,7 +276,7 @@ bool QMutex::tryLock(int timeout) QT_MUTEX_LOCK_NOEXCEPT
returns \c false returns \c false
*/ */
/*! \fn bool QMutex::try_lock_for(std::chrono::duration<Rep, Period> duration) /*! \fn template <class Rep, class Period> bool QMutex::try_lock_for(std::chrono::duration<Rep, Period> duration)
\since 5.8 \since 5.8
Attempts to lock the mutex. This function returns \c true if the lock Attempts to lock the mutex. This function returns \c true if the lock
@ -300,7 +300,7 @@ bool QMutex::tryLock(int timeout) QT_MUTEX_LOCK_NOEXCEPT
\sa lock(), unlock() \sa lock(), unlock()
*/ */
/*! \fn bool QMutex::try_lock_until(std::chrono::time_point<Clock, Duration> timePoint) /*! \fn template<class Clock, class Duration> bool QMutex::try_lock_until(std::chrono::time_point<Clock, Duration> timePoint)
\since 5.8 \since 5.8
Attempts to lock the mutex. This function returns \c true if the lock Attempts to lock the mutex. This function returns \c true if the lock

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

@ -139,7 +139,7 @@ public:
// Lockable concept // Lockable concept
bool try_lock() QT_MUTEX_LOCK_NOEXCEPT { return tryLock(); } bool try_lock() QT_MUTEX_LOCK_NOEXCEPT { return tryLock(); }
#if QT_HAS_INCLUDE(<chrono>) #if QT_HAS_INCLUDE(<chrono>) || defined(Q_CLANG_QDOC)
// TimedLockable concept // TimedLockable concept
template <class Rep, class Period> template <class Rep, class Period>
bool try_lock_for(std::chrono::duration<Rep, Period> duration) bool try_lock_for(std::chrono::duration<Rep, Period> duration)