diff options
| author | Rolland Dudemaine <rolland@ghs.com> | 2011-02-22 16:27:55 +0100 |
|---|---|---|
| committer | Harald Fernengel <harald.fernengel@nokia.com> | 2011-02-22 16:27:55 +0100 |
| commit | 31d29750e65d5e937f12d1d061f3e41e7453880f (patch) | |
| tree | 2fa014608132aa875dcd3ee63c6e13b4f3d325a3 /src/corelib/kernel/qeventdispatcher_unix.cpp | |
| parent | 9ced42aa3351e2f07e3e408adfc3f88ac56a7caf (diff) | |
Various INTEGRITY fixes
Some smaller adaptation for missing POSIX calls
and some build system tweaks for the INTEGRITY RTOS
Merge-request: 1101
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
Diffstat (limited to 'src/corelib/kernel/qeventdispatcher_unix.cpp')
| -rw-r--r-- | src/corelib/kernel/qeventdispatcher_unix.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp index 25c02c4ee9..dceb51d181 100644 --- a/src/corelib/kernel/qeventdispatcher_unix.cpp +++ b/src/corelib/kernel/qeventdispatcher_unix.cpp @@ -116,7 +116,7 @@ QEventDispatcherUNIXPrivate::QEventDispatcherUNIXPrivate() // do nothing. #elif defined(Q_OS_INTEGRITY) // INTEGRITY doesn't like a "select" on pipes, so use socketpair instead - if (socketpair(AF_INET, SOCK_STREAM, PF_INET, thread_pipe) == -1) { + if (socketpair(AF_INET, SOCK_STREAM, 0, thread_pipe) == -1) { perror("QEventDispatcherUNIXPrivate(): Unable to create socket pair"); pipefail = true; } else { @@ -343,7 +343,7 @@ timeval QTimerInfoList::updateCurrentTime() return (currentTime = qt_gettime()); } -#if ((_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_MAC)) || defined(QT_BOOTSTRAPPED) +#if ((_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_MAC) && !defined(Q_OS_INTEGRITY)) || defined(QT_BOOTSTRAPPED) template <> timeval qAbs(const timeval &t) |