qt5-qtbase/libqt5-5.0.2-gcc-4.8.patch

22 lines
814 B
Diff
Raw Permalink Normal View History

--- qt-everywhere-opensource-src-5.0.2/qtbase/src/corelib/kernel/qtimerinfo_unix.cpp.orig 2013-04-11 14:20:31.256727458 +0200
+++ qt-everywhere-opensource-src-5.0.2/qtbase/src/corelib/kernel/qtimerinfo_unix.cpp 2013-04-11 14:21:34.184115658 +0200
@@ -94,8 +94,7 @@
#if ((_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_MAC) && !defined(Q_OS_INTEGRITY)) || defined(QT_BOOTSTRAPPED)
-template <>
-timeval qAbs(const timeval &t)
+timeval qAbsTimeval(const timeval &t)
{
timeval tmp = t;
if (tmp.tv_sec < 0) {
@@ -144,7 +143,7 @@
timeval tickGranularity;
tickGranularity.tv_sec = 0;
tickGranularity.tv_usec = msPerTick * 1000;
- return elapsedTimeTicks < ((qAbs(*delta) - tickGranularity) * 10);
+ return elapsedTimeTicks < ((qAbsTimeval(*delta) - tickGranularity) * 10);
}
/*