From bd5b4de839938bd3be253b1708439fed6f275b7c Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Sat, 11 Aug 2012 18:18:27 +0200
Subject: 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>
---
 src/corelib/thread/qmutex.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/corelib/thread')

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();
-- 
cgit v1.2.3