diff options
| author | Liang Qi <liang.qi@nokia.com> | 2011-07-25 11:48:13 (GMT) |
|---|---|---|
| committer | Liang Qi <liang.qi@nokia.com> | 2011-07-25 11:48:13 (GMT) |
| commit | cd43f2dabaf157efbb52d2ecf57f049e0733910c (patch) | |
| tree | 0fe861c8d4a7a9bc7c5e19d3e3f149bedf4aa6a0 /src/corelib/thread/qmutex_unix.cpp | |
| parent | a0da99611734651f8ad4de3090f7ab05c2b2f9c1 (diff) | |
| parent | be99c17beae01fbc0eabe6f0cfa4b09ebbaa9dbb (diff) | |
| download | Qt-cd43f2dabaf157efbb52d2ecf57f049e0733910c.zip Qt-cd43f2dabaf157efbb52d2ecf57f049e0733910c.tar.gz Qt-cd43f2dabaf157efbb52d2ecf57f049e0733910c.tar.bz2 | |
Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7
Conflicts:
src/opengl/qpixmapdata_symbiangl.cpp
Diffstat (limited to 'src/corelib/thread/qmutex_unix.cpp')
| -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; |