diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-05-18 12:56:44 (GMT) |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-05-18 12:56:44 (GMT) |
| commit | 181dc3984ddf1445d85d085f82c7d14f2fc08519 (patch) | |
| tree | 6c728d05d54ae91548fa7493682faa3c4c4fc662 /src/corelib/concurrent/qtconcurrentiteratekernel.cpp | |
| parent | 37930d767ad67912b58332a87b6b6efc942a3082 (diff) | |
| parent | 6e81bfbaf69864a06240835e0b30cdc47a2668b7 (diff) | |
| download | Qt-181dc3984ddf1445d85d085f82c7d14f2fc08519.zip Qt-181dc3984ddf1445d85d085f82c7d14f2fc08519.tar.gz Qt-181dc3984ddf1445d85d085f82c7d14f2fc08519.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/corelib/concurrent/qtconcurrentiteratekernel.cpp')
| -rw-r--r-- | src/corelib/concurrent/qtconcurrentiteratekernel.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/corelib/concurrent/qtconcurrentiteratekernel.cpp b/src/corelib/concurrent/qtconcurrentiteratekernel.cpp index 5c20146..bfc0e82 100644 --- a/src/corelib/concurrent/qtconcurrentiteratekernel.cpp +++ b/src/corelib/concurrent/qtconcurrentiteratekernel.cpp @@ -108,11 +108,17 @@ static qint64 getticks() return 0; return (ts.tv_sec * 1000000000) + ts.tv_nsec; #else + +#ifdef Q_OS_SYMBIAN + return clock(); +#else // no clock_gettime(), fall back to wall time struct timeval tv; gettimeofday(&tv, 0); return (tv.tv_sec * 1000000) + tv.tv_usec; #endif + +#endif } #elif defined(Q_OS_WIN) |