diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-08-11 18:18:27 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-14 03:45:50 +0200 |
| commit | bd5b4de839938bd3be253b1708439fed6f275b7c (patch) | |
| tree | 44818d477ed84d5c31bd629e2f29d95d01092079 /src/corelib/thread | |
| parent | 0cc97411d51a8e9fda2be7d406ecdcb0e57e5a12 (diff) | |
Remove QBasicAtomic::tryLock with a timer
The non-futex implementation does not support timed locks in
QBasicMutex. That is only supported in QMutex (due to the
destructor).
Change-Id: I46d33a66a36e05c8a4344823537178e80a6ddd76
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/thread')
| -rw-r--r-- | src/corelib/thread/qmutex.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/thread/qmutex.h b/src/corelib/thread/qmutex.h index dd1455058d..90bd93adef 100644 --- a/src/corelib/thread/qmutex.h +++ b/src/corelib/thread/qmutex.h @@ -75,8 +75,8 @@ public: unlockInternal(); } - bool tryLock(int timeout = 0) QT_MUTEX_LOCK_NOEXCEPT { - return fastTryLock() || lockInternal(timeout); + bool tryLock() Q_DECL_NOTHROW { + return fastTryLock(); } bool isRecursive(); |