diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-08-30 16:11:03 +0200 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-08-30 16:11:03 +0200 |
| commit | 1ba3cac3c7296320ca914f262f124ae7f2dea841 (patch) | |
| tree | 40e9c04835dcfe8adccb4cedfda5e568f3c92677 /src/testlib | |
| parent | 708978d1c18cf938a4e0c29a5a90be5de4e82140 (diff) | |
| parent | 51582e3d1251766a3ed941530d966e1a591cbed6 (diff) | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
qmake/generators/win32/msbuild_objectmodel.cpp
qmake/generators/win32/msvc_vcxproj.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
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 932852c090..20a3bc115c 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 |