diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-08-30 12:58:04 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-08-30 12:58:04 (GMT) |
| commit | be69c316c56379d2b955491ffc54754018079dec (patch) | |
| tree | c7305db1cbfcc2886928e099450fc56dbc9e9db7 /src/testlib | |
| parent | 308cc906b80a1cfffde6604f158705101670b824 (diff) | |
| parent | b4a7eadb28a49ace84994dcff665b1cabae69652 (diff) | |
| download | Qt-be69c316c56379d2b955491ffc54754018079dec.zip Qt-be69c316c56379d2b955491ffc54754018079dec.tar.gz Qt-be69c316c56379d2b955491ffc54754018079dec.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1.git into doc-4.7
Conflicts:
doc/src/getting-started/examples.qdoc
doc/src/index.qdoc
Diffstat (limited to 'src/testlib')
| -rw-r--r-- | src/testlib/qbenchmarkmeasurement_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/testlib/qbenchmarkmeasurement_p.h b/src/testlib/qbenchmarkmeasurement_p.h index 932852c..20a3bc1 100644 --- a/src/testlib/qbenchmarkmeasurement_p.h +++ b/src/testlib/qbenchmarkmeasurement_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtCore/qdatetime.h> +#include <QtCore/qelapsedtimer.h> #include "3rdparty/cycle_p.h" #include "qbenchmark.h" @@ -87,7 +87,7 @@ public: bool needsWarmupIteration(); QTest::QBenchmarkMetric metricType(); private: - QTime time; + QElapsedTimer time; }; #ifdef HAVE_TICK_COUNTER // defined in 3rdparty/cycle_p.h |