diff -r 93b982ccede2 -r 5daf16870df6 src/testlib/qbenchmarkvalgrind.cpp --- a/src/testlib/qbenchmarkvalgrind.cpp Mon Jun 21 22:38:13 2010 +0100 +++ b/src/testlib/qbenchmarkvalgrind.cpp Thu Jul 22 16:41:55 2010 +0100 @@ -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