diff options
| author | Peter Hartmann <peter.hartmann@trolltech.com> | 2009-07-15 10:30:21 (GMT) |
|---|---|---|
| committer | Peter Hartmann <peter.hartmann@trolltech.com> | 2009-07-15 10:30:21 (GMT) |
| commit | 97f82b2344334fa158f20e4ed059984fd3c43162 (patch) | |
| tree | 05a38900c0409a904f45ad35b7447baef13623ed /src/corelib/concurrent/qtconcurrentiteratekernel.cpp | |
| parent | 2567ec486d5d95dc4ca06874cf75bf03bd7502b9 (diff) | |
| parent | 28d0930593c6c04a7ef538353f8bee55df00a0e8 (diff) | |
| download | Qt-97f82b2344334fa158f20e4ed059984fd3c43162.zip Qt-97f82b2344334fa158f20e4ed059984fd3c43162.tar.gz Qt-97f82b2344334fa158f20e4ed059984fd3c43162.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/corelib/concurrent/qtconcurrentiteratekernel.cpp')
| -rw-r--r-- | src/corelib/concurrent/qtconcurrentiteratekernel.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/corelib/concurrent/qtconcurrentiteratekernel.cpp b/src/corelib/concurrent/qtconcurrentiteratekernel.cpp index a26cc07..ee1ed3a 100644 --- a/src/corelib/concurrent/qtconcurrentiteratekernel.cpp +++ b/src/corelib/concurrent/qtconcurrentiteratekernel.cpp @@ -42,20 +42,14 @@ #include "qtconcurrentiteratekernel.h" #if defined(Q_OS_MAC) - #include <mach/mach.h> #include <mach/mach_time.h> #include <unistd.h> - #elif defined(Q_OS_UNIX) - #include <time.h> #include <unistd.h> - #elif defined(Q_OS_WIN) - -#include <windows.h> - +#include <qt_windows.h> #endif |