Changeset 846 for trunk/src/testlib/qbenchmark.h

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/qbenchmark.h (modified) (4 diffs)

trunk/src/testlib/qbenchmark.h

@@ -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)
@@ -44 +44 @@
 
 #include <QtTest/qtest_global.h>
+#include <QtTest/qbenchmarkmetric.h>
 
 QT_BEGIN_HEADER
@@ -76 +77 @@
 }
 
+// --- BEGIN public API ---
+
 #define QBENCHMARK \
     for (QTest::QBenchmarkIterationController __iteration_controller; \
@@ -84 +87 @@
             __iteration_controller.isDone() == false; __iteration_controller.next())
 
+namespace QTest
+{
+    void Q_TESTLIB_EXPORT setBenchmarkResult(qreal result, QBenchmarkMetric metric);
+}
+
+// --- END public API ---
+
 QT_END_NAMESPACE