diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-08-31 13:46:39 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-09-10 11:24:19 +0200 |
| commit | a8caae37ef21e06512364f513e930f2bafd543e8 (patch) | |
| tree | 752654dc3780764d4ea8b32287d5cac7bd40f862 /src/corelib/thread | |
| parent | 6e8985e3576a4439bd66c0767f9912d1e124682c (diff) | |
Remove redundant non-const QMutex::isRecursive()
As directed by ### Qt 6 comment.
Task-number: QTBUG-85700
Change-Id: Iae4179b017840efe4902de2b1529cf7ec0606865
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/thread')
| -rw-r--r-- | src/corelib/thread/qmutex.cpp | 13 | ||||
| -rw-r--r-- | src/corelib/thread/qmutex.h | 2 |
2 files changed, 0 insertions, 15 deletions
diff --git a/src/corelib/thread/qmutex.cpp b/src/corelib/thread/qmutex.cpp index 9bfd50f2d9..7f052feaa5 100644 --- a/src/corelib/thread/qmutex.cpp +++ b/src/corelib/thread/qmutex.cpp @@ -349,19 +349,6 @@ void QMutex::unlock() noexcept unlockInternal(); } - -/*! - \fn bool QMutex::isRecursive() const - \since 5.7 - - Returns \c true if the mutex is recursive. -*/ - -bool QBasicMutex::isRecursive() noexcept -{ - return QT_PREPEND_NAMESPACE(isRecursive)(d_ptr.loadAcquire()); -} - /*! \since 5.7 diff --git a/src/corelib/thread/qmutex.h b/src/corelib/thread/qmutex.h index 8ac6088c12..c1c87100e6 100644 --- a/src/corelib/thread/qmutex.h +++ b/src/corelib/thread/qmutex.h @@ -94,8 +94,6 @@ public: // Lockable concept bool try_lock() noexcept { return tryLock(); } - - bool isRecursive() noexcept; //### Qt6: remove me bool isRecursive() const noexcept; private: |