From a530ffd6def62b0d81f8bdfd02e54c62cd4d8d8f Mon Sep 17 00:00:00 2001 From: Morten Johan Sorvig Date: Thu, 24 May 2012 10:12:19 +0200 Subject: QtConcurrent: Remove QMutex kept for BC reasons. Task-number: QTBUG-25052 Since upgrading to Qt 5 forces a recompile there are no longer inline versions of the acquire/release functions in play. Change-Id: I6ce6abe0f16f810891f32c7e8c5c94726e5de873 Reviewed-by: Bradley T. Hughes --- src/concurrent/qtconcurrentthreadengine.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/concurrent') diff --git a/src/concurrent/qtconcurrentthreadengine.h b/src/concurrent/qtconcurrentthreadengine.h index 3ecdc84600..9d8f2ddd58 100644 --- a/src/concurrent/qtconcurrentthreadengine.h +++ b/src/concurrent/qtconcurrentthreadengine.h @@ -72,11 +72,7 @@ private: // variable. The count can be either positive or negative - a negative // count signals that a thread is waiting on the barrier. - // BC note: inlined code from Qt < 4.6 will expect to find the QMutex - // and QAtomicInt here. ### Qt 5: remove. - QMutex mutex; QAtomicInt count; - QSemaphore semaphore; public: ThreadEngineBarrier(); -- cgit v1.2.3