diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2023-07-12 18:26:12 +0200 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2023-07-13 07:49:47 +0000 |
| commit | 93fe8cb305791ab0099831361ff1634a047dd13f (patch) | |
| tree | 890467e87438148bc373b2a1bf5f6bc5fd4e061c /src/corelib/thread/qmutex.h | |
| parent | df96d39c048a467213c6170dc8e225116f31a7e3 (diff) | |
QRecursiveMutex: remove QDeadlineTimer::Forever leftover
Amends 5f531ae2ac873c09deda096d292777422c4dee4d
The overload taking QDeadlineTimer::ForeverConstant was required,
prior to making it an enum class, because the conversion preferred
'int'. It was made an enum class for 6.6 and most overloads were
removed, including the one for QMutex, but QRecursiveMutex was
missed.
Pick-to: 6.6
Change-Id: I4490dd3d7641c06346ea502f10c09915411319ad
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/thread/qmutex.h')
| -rw-r--r-- | src/corelib/thread/qmutex.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/corelib/thread/qmutex.h b/src/corelib/thread/qmutex.h index 496d0ea502..6081bfe4cc 100644 --- a/src/corelib/thread/qmutex.h +++ b/src/corelib/thread/qmutex.h @@ -200,12 +200,6 @@ public: { return tryLock(QDeadlineTimer(timePoint)); } - -#ifndef Q_QDOC - // because tryLock(QDeadlineTimer::Forever) is tryLock(0) - bool tryLock(QDeadlineTimer::ForeverConstant) QT_MUTEX_LOCK_NOEXCEPT - { lock(); return true; } -#endif }; #if QT_CORE_INLINE_IMPL_SINCE(6, 6) |