diff options
| author | mread <qt-info@nokia.com> | 2011-04-19 13:12:24 +0100 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-10 12:54:48 +0200 |
| commit | 3e787c470de8ea37f9f2b244bf3bbbb86ac65acd (patch) | |
| tree | 84109fdf85401c64ace4a945ea37cddb680ebceb /src/corelib | |
| parent | 6c42aa3b0f86a5c6e1407006db4c4485fa29aeca (diff) | |
Symbian's QElapsedTimer::restart() fixed to return ms rather than us
Symbian's QElapsedTimer::restart() had accidently been changed to
return a microsecond count rather than milliseconds, when the elapsed
timer resolution was increased. This fixes it back to milliseconds.
Reviewed-by: Shane Kearns
(cherry picked from commit 39202973e3fb7ff37033290b29efa1b9edc674fb)
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qelapsedtimer_symbian.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qelapsedtimer_symbian.cpp b/src/corelib/tools/qelapsedtimer_symbian.cpp index b831e03208..3667b05315 100644 --- a/src/corelib/tools/qelapsedtimer_symbian.cpp +++ b/src/corelib/tools/qelapsedtimer_symbian.cpp @@ -95,7 +95,7 @@ qint64 QElapsedTimer::restart() qint64 oldt1 = t1; t1 = getMicrosecondFromTick(); t2 = 0; - return t1 - oldt1; + return (t1 - oldt1) / 1000; } qint64 QElapsedTimer::nsecsElapsed() const |