Changeset 846 for trunk/src/testlib/qxmltestlogger.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/qxmltestlogger.cpp (modified) (3 diffs)

trunk/src/testlib/qxmltestlogger.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -47 +47 @@
 #include "QtTest/private/qtestresult_p.h"
 #include "QtTest/private/qbenchmark_p.h"
+#include "QtTest/private/qbenchmarkmetric_p.h"
 #include "QtTest/qtestcase.h"
 
@@ -244 +245 @@
 
     xmlQuote(&quotedMetric,
-        QBenchmarkGlobalData::current->measurer->metricText().toAscii().constData());
+        benchmarkMetricName(result.metric));
     xmlQuote(&quotedTag, result.context.tag.toAscii().constData());