diff options
| author | Martin Smith <martin.smith@qt.io> | 2018-01-03 13:21:57 +0100 |
|---|---|---|
| committer | Martin Smith <martin.smith@qt.io> | 2018-01-04 12:50:42 +0000 |
| commit | 58a47ccfe5bbd10c1f055c70ca87b6bded57fd4a (patch) | |
| tree | 57be7e5aac39151c8c5f26cb63a6204ede00421b /src/corelib/thread | |
| parent | 9e005c94010781de47fdf92733ea973001cf1ed5 (diff) | |
doc: Correct remaining qdoc warnings in qmutex.cpp
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>
Diffstat (limited to 'src/corelib/thread')
| -rw-r--r-- | src/corelib/thread/qmutex.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/thread/qmutex.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/thread/qmutex.cpp b/src/corelib/thread/qmutex.cpp index 3e7033451e..63fb6f3efb 100644 --- a/src/corelib/thread/qmutex.cpp +++ b/src/corelib/thread/qmutex.cpp @@ -276,7 +276,7 @@ bool QMutex::tryLock(int timeout) QT_MUTEX_LOCK_NOEXCEPT 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 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() */ -/*! \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 Attempts to lock the mutex. This function returns \c true if the lock diff --git a/src/corelib/thread/qmutex.h b/src/corelib/thread/qmutex.h index 3dff363541..7cda53db5f 100644 --- a/src/corelib/thread/qmutex.h +++ b/src/corelib/thread/qmutex.h @@ -139,7 +139,7 @@ public: // Lockable concept 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 template <class Rep, class Period> bool try_lock_for(std::chrono::duration<Rep, Period> duration) |