1 files changed, 7 insertions, 14 deletions
diff --git a/src/testlib/qbenchmarkvalgrind.cpp b/src/testlib/qbenchmarkvalgrind.cpp
index 43e444b211..bea3066e66 100644
--- a/src/testlib/qbenchmarkvalgrind.cpp
+++ b/src/testlib/qbenchmarkvalgrind.cpp
@@ -45,7 +45,10 @@ bool QBenchmarkValgrindUtils::rerunThroughCallgrind(const QStringList &origAppAr
 static void dumpOutput(const QByteArray &data, FILE *fh)
 {
     QFile file;
-    file.open(fh, QIODevice::WriteOnly);
+    if (!file.open(fh, QIODevice::WriteOnly)) {
+        qFatal("Could not open filehandle for dumping output: %s",
+               qPrintable(file.errorString()));
+    }
     file.write(data);
 }
 
@@ -170,19 +173,14 @@ void QBenchmarkCallgrindMeasurer::start()
     CALLGRIND_ZERO_STATS;
 }
 
-qint64 QBenchmarkCallgrindMeasurer::checkpoint()
+QList<QBenchmarkMeasurerBase::Measurement> QBenchmarkCallgrindMeasurer::stop()
 {
     CALLGRIND_DUMP_STATS;
     const qint64 result = QBenchmarkValgrindUtils::extractLastResult();
-    return result;
-}
-
-qint64 QBenchmarkCallgrindMeasurer::stop()
-{
-    return checkpoint();
+    return { { qreal(result), QTest::InstructionReads } };
 }
 
-bool QBenchmarkCallgrindMeasurer::isMeasurementAccepted(qint64 measurement)
+bool QBenchmarkCallgrindMeasurer::isMeasurementAccepted(Measurement measurement)
 {
     Q_UNUSED(measurement);
     return true;
@@ -203,9 +201,4 @@ bool QBenchmarkCallgrindMeasurer::needsWarmupIteration()
     return true;
 }
 
-QTest::QBenchmarkMetric QBenchmarkCallgrindMeasurer::metricType()
-{
-    return QTest::InstructionReads;
-}
-
 QT_END_NAMESPACE