diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-06 00:11:52 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-06 00:11:52 +0100 |
| commit | b86106387350f673a20d3b0a2413023f6205169b (patch) | |
| tree | 2dfc079f1eecbbf9fde8733430a3a1e2f04d9a42 /src/corelib/kernel/qtimerinfo_unix.cpp | |
| parent | 88918abddeb323340c4a49dda035898a740373da (diff) | |
| parent | 5e8ae03578ecd0538a774505f2f7e2fc626b0ab7 (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/kernel/qtimerinfo_unix.cpp')
| -rw-r--r-- | src/corelib/kernel/qtimerinfo_unix.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/corelib/kernel/qtimerinfo_unix.cpp b/src/corelib/kernel/qtimerinfo_unix.cpp index a81fa83f29..0e33fa697a 100644 --- a/src/corelib/kernel/qtimerinfo_unix.cpp +++ b/src/corelib/kernel/qtimerinfo_unix.cpp @@ -94,8 +94,7 @@ timespec QTimerInfoList::updateCurrentTime() #if ((_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_MAC) && !defined(Q_OS_INTEGRITY)) || defined(QT_BOOTSTRAPPED) -template <> -timespec qAbs(const timespec &t) +timespec qAbsTimespec(const timespec &t) { timespec tmp = t; if (tmp.tv_sec < 0) { @@ -144,7 +143,7 @@ bool QTimerInfoList::timeChanged(timespec *delta) timespec tickGranularity; tickGranularity.tv_sec = 0; tickGranularity.tv_nsec = msPerTick * 1000 * 1000; - return elapsedTimeTicks < ((qAbs(*delta) - tickGranularity) * 10); + return elapsedTimeTicks < ((qAbsTimespec(*delta) - tickGranularity) * 10); } /* |