diff options
| author | Pasi Petäjäjärvi <pasi.petajajarvi@digia.com> | 2013-01-24 13:55:49 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-28 13:55:39 +0100 |
| commit | 71b185ebb992fb8d6eeac36f08afdb297a0d290f (patch) | |
| tree | b6e22b85b1867541d09088a9b09f0a478d2ea305 | |
| parent | 23cda4768990e7a0ed13544930d7a02deb9757ae (diff) | |
Use time.h related includes from qfunctions_vxworks.h file.
In VxWorks qfunctions_vxworks.h file includes correct time
related headers and it is included already at file
qplatformdefs.h for all mkspecs targets.
Change-Id: Icf970e28bf6deba9201fa33d7f728cc2251f7e5c
(cherry picked from qtbase/2d2da44f6381fdeaa195319c0dc66e3909c2ca7b)
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| -rw-r--r-- | src/corelib/kernel/qeventdispatcher_unix_p.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_unix_p.h b/src/corelib/kernel/qeventdispatcher_unix_p.h index 50826efbc6..d8c89d92ad 100644 --- a/src/corelib/kernel/qeventdispatcher_unix_p.h +++ b/src/corelib/kernel/qeventdispatcher_unix_p.h @@ -60,9 +60,7 @@ #include "private/qpodlist_p.h" #include "QtCore/qvarlengtharray.h" -#if defined(Q_OS_VXWORKS) -# include <sys/times.h> -#else +#if !defined(Q_OS_VXWORKS) # include <sys/time.h> # if (!defined(Q_OS_HPUX) || defined(__ia64)) && !defined(Q_OS_NACL) # include <sys/select.h> |