diff options
Diffstat (limited to 'src/corelib/kernel/qtimerinfo_unix.cpp')
| -rw-r--r-- | src/corelib/kernel/qtimerinfo_unix.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/corelib/kernel/qtimerinfo_unix.cpp b/src/corelib/kernel/qtimerinfo_unix.cpp index af880ef522..10c5f04839 100644 --- a/src/corelib/kernel/qtimerinfo_unix.cpp +++ b/src/corelib/kernel/qtimerinfo_unix.cpp @@ -64,7 +64,7 @@ Q_CORE_EXPORT bool qt_disable_lowpriority_timers=false; QTimerInfoList::QTimerInfoList() { -#if (_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_MAC) && !defined(Q_OS_NACL) +#if (_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_MAC) if (!QElapsedTimer::isMonotonic()) { // not using monotonic timers, initialize the timeChanged() machinery previousTime = qt_gettime(); @@ -115,10 +115,6 @@ timespec qAbsTimespec(const timespec &t) */ bool QTimerInfoList::timeChanged(timespec *delta) { -#ifdef Q_OS_NACL - Q_UNUSED(delta); - return false; // Calling "times" crashes. -#endif struct tms unused; clock_t currentTicks = times(&unused); |