diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-22 14:33:09 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-22 14:33:09 (GMT) |
| commit | cfa6c0921a0832af1e01576be9688b9f7015e323 (patch) | |
| tree | 103e79210cf369b1f718cadc2f37aa029227e91c /src/corelib | |
| parent | b8327a0d5c5192750f7bf959290f6a50cdcb85b5 (diff) | |
| parent | f6735134a3637ae09442ad592f74a551830577fc (diff) | |
| download | Qt-cfa6c0921a0832af1e01576be9688b9f7015e323.zip Qt-cfa6c0921a0832af1e01576be9688b9f7015e323.tar.gz Qt-cfa6c0921a0832af1e01576be9688b9f7015e323.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
Fix the timeout calculation again.
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/thread/qmutex_unix.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/thread/qmutex_unix.cpp b/src/corelib/thread/qmutex_unix.cpp index e692e19..2a9d23c 100644 --- a/src/corelib/thread/qmutex_unix.cpp +++ b/src/corelib/thread/qmutex_unix.cpp @@ -161,8 +161,8 @@ bool QMutexPrivate::wait(int timeout) return false; } - ts.tv_sec = timeout / Q_INT64_C(1000) / 1000 / 1000; - ts.tv_nsec = timeout % (Q_INT64_C(1000) * 1000 * 1000); + ts.tv_sec = xtimeout / Q_INT64_C(1000) / 1000 / 1000; + ts.tv_nsec = xtimeout % (Q_INT64_C(1000) * 1000 * 1000); } } return true; |