Changeset 846 for trunk/src/testlib/qbenchmarkvalgrind.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/testlib/qbenchmarkvalgrind.cpp (modified) (2 diffs)

trunk/src/testlib/qbenchmarkvalgrind.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -264 +264 @@
 }
 
-QString QBenchmarkCallgrindMeasurer::unitText()
-{
-    return QLatin1String("instr. loads");
-}
-
-QString QBenchmarkCallgrindMeasurer::metricText()
-{
-    return QLatin1String("callgrind");
+QTest::QBenchmarkMetric QBenchmarkCallgrindMeasurer::metricType()
+{
+    return QTest::InstructionReads;
 }