diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-01-04 08:48:39 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-01-04 08:48:39 (GMT) |
| commit | c855c61ed5c80a97f3a2858a15453f9e041db7f8 (patch) | |
| tree | 68b86fe5adc7a5c19a237ee1e5bba147ccf92f23 /src/corelib/concurrent/qtconcurrentiteratekernel.cpp | |
| parent | 65a0c8cc6d2c13cfb2cef22e8a23f4e3050fde25 (diff) | |
| parent | 06bdf48e9194d73075041efecde5c70a144d6927 (diff) | |
| download | Qt-c855c61ed5c80a97f3a2858a15453f9e041db7f8.zip Qt-c855c61ed5c80a97f3a2858a15453f9e041db7f8.tar.gz Qt-c855c61ed5c80a97f3a2858a15453f9e041db7f8.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src/corelib/concurrent/qtconcurrentiteratekernel.cpp')
| -rw-r--r-- | src/corelib/concurrent/qtconcurrentiteratekernel.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/concurrent/qtconcurrentiteratekernel.cpp b/src/corelib/concurrent/qtconcurrentiteratekernel.cpp index 15b8ecd..e93394f 100644 --- a/src/corelib/concurrent/qtconcurrentiteratekernel.cpp +++ b/src/corelib/concurrent/qtconcurrentiteratekernel.cpp @@ -46,6 +46,9 @@ #include <mach/mach_time.h> #include <unistd.h> #elif defined(Q_OS_UNIX) +#if defined(Q_OS_HURD) +#include <sys/time.h> +#endif #include <time.h> #include <unistd.h> #elif defined(Q_OS_WIN) |