summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago@kde.org>2011-07-21 17:10:30 +0200
committerQt by Nokia <qt-info@nokia.com>2011-07-21 22:36:39 +0200
commit038d7c6c3b9815068e1f5b6df12625181f0313e1 (patch)
treea6fa685b29b7d4ef7b224a4c1f58b2f31e13dd75
parent2a4ab8590587a8a39d3b2133df3d989f1d844404 (diff)
Fix the timeout calculation again.
The commit 412ef92162f8874a1585221125c31ef5f8ccc9cb introduced a fix, but the fix was incomplete. Fix it for good. Change-Id: I3e7fbdb294f8e960fbbf2e830790750240ed813a Merge-request: 30 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/1991 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
-rw-r--r--src/corelib/thread/qmutex_unix.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/thread/qmutex_unix.cpp b/src/corelib/thread/qmutex_unix.cpp
index e692e19525..2a9d23c361 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;