summaryrefslogtreecommitdiffstats
path: root/src/corelib/concurrent/qtconcurrentiteratekernel.cpp
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2010-01-06 12:45:29 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2010-01-06 12:45:29 (GMT)
commita628b5579a977594cf125110589c8bd5096db380 (patch)
tree104988aaef8d19f7a24610eef50ebb9633eaa376 /src/corelib/concurrent/qtconcurrentiteratekernel.cpp
parent982cffb529f65c7d0c401844ef9af1925e550ffb (diff)
parente8b3defc466fff9110ee00b6e730d405cde52abc (diff)
downloadQt-a628b5579a977594cf125110589c8bd5096db380.zip
Qt-a628b5579a977594cf125110589c8bd5096db380.tar.gz
Qt-a628b5579a977594cf125110589c8bd5096db380.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.cpp3
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)