diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-30 07:08:43 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-30 07:08:43 (GMT) |
| commit | f5acc7b83f79c0bce554a6e4fe2d9e6ebb4b582b (patch) | |
| tree | 865471e5d53175f66e5a8e13926285c289ca1437 /src/script/qscriptecmadate.cpp | |
| parent | 0eaa3466077839b0cef2ad6c326d80f398eccae7 (diff) | |
| parent | c1a90a535206e0a146e13c60d981a855178e69ca (diff) | |
| download | Qt-f5acc7b83f79c0bce554a6e4fe2d9e6ebb4b582b.zip Qt-f5acc7b83f79c0bce554a6e4fe2d9e6ebb4b582b.tar.gz Qt-f5acc7b83f79c0bce554a6e4fe2d9e6ebb4b582b.tar.bz2 | |
Merge branch 'master' of git://git-nokia.trolltech.com.au/qtsoftware/qt/qt
Diffstat (limited to 'src/script/qscriptecmadate.cpp')
| -rw-r--r-- | src/script/qscriptecmadate.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/script/qscriptecmadate.cpp b/src/script/qscriptecmadate.cpp index 9b53724..8c91a25 100644 --- a/src/script/qscriptecmadate.cpp +++ b/src/script/qscriptecmadate.cpp @@ -58,10 +58,14 @@ #include <math.h> #ifndef Q_WS_WIN -# include <time.h> -# include <sys/time.h> +# include <time.h> +# ifndef Q_OS_VXWORKS +# include <sys/time.h> +# else +# include "qplatformdefs.h" +# endif #else -# include <windows.h> +# include <windows.h> #endif QT_BEGIN_NAMESPACE |