diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-13 01:00:53 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-13 01:00:53 (GMT) |
| commit | a301ccba853e34147d1a6276a77d9fd26ac0f6a1 (patch) | |
| tree | 181058ad716bc9a81ac160ce427211d28b262541 /src/corelib | |
| parent | 1cb8e4b9a569023ad44060252df0b891c1a331d1 (diff) | |
| parent | 06b513193715d5f442a6fd749667aed83944927a (diff) | |
| download | Qt-a301ccba853e34147d1a6276a77d9fd26ac0f6a1.zip Qt-a301ccba853e34147d1a6276a77d9fd26ac0f6a1.tar.gz Qt-a301ccba853e34147d1a6276a77d9fd26ac0f6a1.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QtWebKit changelog for Qt 4.6.1
Make compile on HPUX
Modifies the google chat example to use the DOM API
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/kernel/qcore_unix.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/kernel/qcore_unix.cpp b/src/corelib/kernel/qcore_unix.cpp index 328fd3d..0fd965b 100644 --- a/src/corelib/kernel/qcore_unix.cpp +++ b/src/corelib/kernel/qcore_unix.cpp @@ -42,7 +42,9 @@ #include "qcore_unix_p.h" #ifndef Q_OS_VXWORKS +# if !defined(Q_OS_HPUX) || defined(__ia64) # include <sys/select.h> +# endif # include <sys/time.h> #else # include <selectLib.h> |