summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormread <qt-info@nokia.com>2011-04-19 12:12:24 (GMT)
committermread <qt-info@nokia.com>2011-04-19 13:31:05 (GMT)
commit39202973e3fb7ff37033290b29efa1b9edc674fb (patch)
tree2e893f6ac3d13149323425d573f58534f25a2eff
parent41aa023ef6019ac9745b780c953f48b8bbc42a42 (diff)
downloadQt-39202973e3fb7ff37033290b29efa1b9edc674fb.zip
Qt-39202973e3fb7ff37033290b29efa1b9edc674fb.tar.gz
Qt-39202973e3fb7ff37033290b29efa1b9edc674fb.tar.bz2
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
-rw-r--r--src/corelib/tools/qelapsedtimer_symbian.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qelapsedtimer_symbian.cpp b/src/corelib/tools/qelapsedtimer_symbian.cpp
index b831e03..3667b05 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