diff options
| author | Tobias Koenig <tobias.koenig@kdab.com> | 2015-02-19 14:10:53 +0000 |
|---|---|---|
| committer | Tobias Koenig <tobias.koenig@kdab.com> | 2015-07-08 18:01:07 +0000 |
| commit | f80b103910cc936e16c247fefb2daa781e09d17e (patch) | |
| tree | 857883f4f3a083305c3563caf064969e276f4de1 /src/corelib/thread/qwaitcondition_unix.cpp | |
| parent | b9438e6cbdc9768253c7c696e4d9f085c067fe31 (diff) | |
Haiku: Fix QWaitCondition on Haiku
The latest version of Haiku provides the implementation
for pthread_condattr_setclock, so we can enable the code
in QWaitCondition again to make it use the monotonic clock
correctly.
Change-Id: Ibb9ad33d873c3b34f2c516087c4e0aeac04cc83f
Reviewed-by: Augustin Cavalier <waddlesplash@gmail.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/thread/qwaitcondition_unix.cpp')
| -rw-r--r-- | src/corelib/thread/qwaitcondition_unix.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/thread/qwaitcondition_unix.cpp b/src/corelib/thread/qwaitcondition_unix.cpp index fd6af7db39..89bf523263 100644 --- a/src/corelib/thread/qwaitcondition_unix.cpp +++ b/src/corelib/thread/qwaitcondition_unix.cpp @@ -77,7 +77,7 @@ void qt_initialize_pthread_cond(pthread_cond_t *cond, const char *where) #if defined(Q_OS_ANDROID) if (local_condattr_setclock && QElapsedTimer::clockType() == QElapsedTimer::MonotonicClock) local_condattr_setclock(&condattr, CLOCK_MONOTONIC); -#elif !defined(Q_OS_MAC) && !defined(Q_OS_HAIKU) +#elif !defined(Q_OS_MAC) if (QElapsedTimer::clockType() == QElapsedTimer::MonotonicClock) pthread_condattr_setclock(&condattr, CLOCK_MONOTONIC); #endif |