diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-05 04:15:13 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-05 04:15:13 (GMT) |
| commit | c98eafb1b6b100cf99518b33b8155aff866eb208 (patch) | |
| tree | 464ff0a329dc02e01fa37310953a661c77a5f4bd /src/corelib/tools | |
| parent | b59fb6e41ffe971c4f33a2595e10db2f8ecc9c15 (diff) | |
| parent | 184a86f81711212fea21a827701eb4e95c37010b (diff) | |
| download | Qt-c98eafb1b6b100cf99518b33b8155aff866eb208.zip Qt-c98eafb1b6b100cf99518b33b8155aff866eb208.tar.gz Qt-c98eafb1b6b100cf99518b33b8155aff866eb208.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Fix BlendBench::unalignedBlendArgb32 test case
Fix memory leak in XSD component of XmlPatterns
Added autotest for threaded text rendering.
Implement support for enable_backup CONFIG value.
Make text rendering working outside the gui thread on Symbian.
Fix autotest failure in XmlPattern qxmlquery
Fix memory leak bugs in XmlPatterns
Symbian's QElapsedTimer::restart() fixed to return ms rather than us
Create a cleanup stack for each new thread on Symbian.
Do not modify window size for fullscreen windows in setGeometry_sys
Fixed Qt UDA creation for Symbian
Enablers for the Qt eclipsing in Symbian
Improve logic to find default certificates in createpackage script
Fix "make sis" for projects that have empty OBJECTS_DIR
Add focus frame support in style sheet
Fix OpenGL build break on Symbian
Diffstat (limited to 'src/corelib/tools')
| -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 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 |