summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Bakken <anders.bakken@nokia.com>2009-07-22 21:39:35 (GMT)
committerAnders Bakken <anders.bakken@nokia.com>2009-07-22 21:39:35 (GMT)
commited7b578fa09155458be48a419f29cc709129984a (patch)
tree86f1f48faca4229c676467b28ca76b50bbc7b87c
parent9e54faf9eae05f66b6772ef25cc63ce52babf7cd (diff)
downloadQt-ed7b578fa09155458be48a419f29cc709129984a.zip
Qt-ed7b578fa09155458be48a419f29cc709129984a.tar.gz
Qt-ed7b578fa09155458be48a419f29cc709129984a.tar.bz2
Compile
The dummy implementaion of QReadWriteLock wasn't source compatible with the real implementation and this lead to compilation errors in qabstractfileengine.cpp which now has a global static QReadWriteLock that takes a Recursive argument. Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
-rw-r--r--src/corelib/thread/qreadwritelock.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/thread/qreadwritelock.h b/src/corelib/thread/qreadwritelock.h
index 51d42b5..4742bea 100644
--- a/src/corelib/thread/qreadwritelock.h
+++ b/src/corelib/thread/qreadwritelock.h
@@ -190,7 +190,8 @@ inline QWriteLocker::QWriteLocker(QReadWriteLock *areadWriteLock)
class Q_CORE_EXPORT QReadWriteLock
{
public:
- inline explicit QReadWriteLock() { }
+ enum RecursionMode { NonRecursive, Recursive };
+ inline explicit QReadWriteLock(RecursionMode = NonRecursive) { }
inline ~QReadWriteLock() { }
static inline void lockForRead() { }