summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorPasi Petäjäjärvi <pasi.petajajarvi@digia.com>2013-01-24 11:50:34 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-01-28 13:11:36 (GMT)
commit6826602240fc2257166b0ea4f31667e792c4a3ae (patch)
treeaf5d78faba242a272e27a17f82a5de95e19c2977 /src/corelib
parentf298e559c5dc745550932343036435aba129cf50 (diff)
downloadQt-6826602240fc2257166b0ea4f31667e792c4a3ae.zip
Qt-6826602240fc2257166b0ea4f31667e792c4a3ae.tar.gz
Qt-6826602240fc2257166b0ea4f31667e792c4a3ae.tar.bz2
Use stub function gettimeofday for VxWorks
Vxworks does not have gettimeofday function, use function implementation from qfunctions_vxworks.h/cpp instead. Change-Id: Iad0b811049b974c555febe1e47398b7df9ddda34 (cherry picked from qtbase/1309d9a9d68af902821d0ba5f76aa6e994aa6963) Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/tools/qelapsedtimer_unix.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/tools/qelapsedtimer_unix.cpp b/src/corelib/tools/qelapsedtimer_unix.cpp
index e0f65fe..d18a217 100644
--- a/src/corelib/tools/qelapsedtimer_unix.cpp
+++ b/src/corelib/tools/qelapsedtimer_unix.cpp
@@ -40,8 +40,12 @@
****************************************************************************/
#include "qelapsedtimer.h"
+#ifdef Q_OS_VXWORKS
+#include "qfunctions_vxworks.h"
+#else
#include <sys/time.h>
#include <time.h>
+#endif
#include <unistd.h>
#if defined(QT_NO_CLOCK_MONOTONIC) || defined(QT_BOOTSTRAPPED)