diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-08-04 09:14:17 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-04 09:14:17 +0200 |
| commit | 673160b9fd7b9a75336ba293dda7e64f3d732a80 (patch) | |
| tree | b37e0216a090fbc9ac19dd55ca5e2ba1af1ef7cb /src/corelib/thread/qwaitcondition_unix.cpp | |
| parent | 9a652ed802d5ec1114ba97ad86eca8d2f25c53d9 (diff) | |
| parent | 92c998afb66a2ec900d50cab57929c0a97ad46ac (diff) | |
Merge "Merge remote branch 'gerrit/master' into refactor" into refactor
Diffstat (limited to 'src/corelib/thread/qwaitcondition_unix.cpp')
| -rw-r--r-- | src/corelib/thread/qwaitcondition_unix.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/thread/qwaitcondition_unix.cpp b/src/corelib/thread/qwaitcondition_unix.cpp index b946a9de24..dd85bf4023 100644 --- a/src/corelib/thread/qwaitcondition_unix.cpp +++ b/src/corelib/thread/qwaitcondition_unix.cpp @@ -146,7 +146,7 @@ bool QWaitCondition::wait(QMutex *mutex, unsigned long time) { if (! mutex) return false; - if (mutex->d->recursive) { + if (mutex->isRecursive()) { qWarning("QWaitCondition: cannot wait on recursive mutexes"); return false; } |