summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorten Johan Sorvig <morten.sorvig@nokia.com>2012-05-24 10:12:19 +0200
committerQt by Nokia <qt-info@nokia.com>2012-05-30 01:54:45 +0200
commita530ffd6def62b0d81f8bdfd02e54c62cd4d8d8f (patch)
tree698965602b904444b02dc9d7307adb8b5a496b2d
parentd725c3ee239bb6e2106b1095e2edd2d900481ba3 (diff)
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 <bradley.hughes@nokia.com>
-rw-r--r--src/concurrent/qtconcurrentthreadengine.h4
1 files changed, 0 insertions, 4 deletions
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();