path: root/src/corelib/kernel/qfunctions_vxworks.cpp
diff options
authorPasi Petäjäjärvi <>2012-06-15 13:33:58 +0300
committerThe Qt Project <>2013-01-23 10:38:47 +0100
commit7e3d5a720752900b1ccbb3d8dcbf12cc02b01b63 (patch)
tree4b9b94db1c5483463f7b2899b9f7e065f3646ee7 /src/corelib/kernel/qfunctions_vxworks.cpp
parentfb5bbea031d6a7cdc033121c01a2fca9c12c67fb (diff)
Use Qt defined gettimeofday for VxWorks and no fallback to X11 version
VxWorks don't have gettimeofday function so we always use the one implemented in Qt. VxWorks DIAB compiler is not supported building Qt for VxWorks 6.9.2. Anyone using older VxWorks should also not be affected so use new defines VXWORKS_DKM and VXWORKS_RTP for VxWorks version 6.9.2 onward. Change-Id: I2e9546a101256ea0557b65163b40cd0f28be8519 Reviewed-by: Samuel Rødal <>
Diffstat (limited to 'src/corelib/kernel/qfunctions_vxworks.cpp')
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qfunctions_vxworks.cpp b/src/corelib/kernel/qfunctions_vxworks.cpp
index add4108762..49d9d51ac0 100644
--- a/src/corelib/kernel/qfunctions_vxworks.cpp
+++ b/src/corelib/kernel/qfunctions_vxworks.cpp
@@ -92,7 +92,7 @@ int usleep(unsigned int usec)
// gettimeofday() is declared, but is missing from the library
// It IS however defined in the Curtis-Wright X11 libraries, so
// we have to make the symbol 'weak'
-#if defined(Q_CC_DIAB)
+#if defined(Q_CC_DIAB) && !defined(VXWORKS_DKM) && !defined(VXWORKS_RTP)
# pragma weak gettimeofday
int gettimeofday(struct timeval *tv, void /*struct timezone*/ *)