diff -r b72c6db6890b -r 5dc02b23752f src/testlib/qbenchmarkvalgrind.cpp --- a/src/testlib/qbenchmarkvalgrind.cpp Wed Jun 23 19:07:03 2010 +0300 +++ b/src/testlib/qbenchmarkvalgrind.cpp Tue Jul 06 15:10:48 2010 +0300 @@ -263,14 +263,9 @@ return true; } -QString QBenchmarkCallgrindMeasurer::unitText() +QTest::QBenchmarkMetric QBenchmarkCallgrindMeasurer::metricType() { - return QLatin1String("instr. loads"); -} - -QString QBenchmarkCallgrindMeasurer::metricText() -{ - return QLatin1String("callgrind"); + return QTest::InstructionReads; } QT_END_NAMESPACE