diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2010-01-08 11:55:25 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2010-01-08 11:55:25 (GMT) |
| commit | 30d45394f59c25fc2c3e7e30da4e49bf9744de76 (patch) | |
| tree | 8483a7b767bb36023f90bca39f8512dc11553f22 /src/testlib/qbenchmarkevent.cpp | |
| parent | d170179f00effe691de23167e02ff5aeecaeb054 (diff) | |
| parent | 2e62227f950aac8205f2b67e4d7d046836b2c799 (diff) | |
| download | Qt-30d45394f59c25fc2c3e7e30da4e49bf9744de76.zip Qt-30d45394f59c25fc2c3e7e30da4e49bf9744de76.tar.gz Qt-30d45394f59c25fc2c3e7e30da4e49bf9744de76.tar.bz2 | |
Merge remote branch 'origin/master'
Diffstat (limited to 'src/testlib/qbenchmarkevent.cpp')
| -rw-r--r-- | src/testlib/qbenchmarkevent.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/testlib/qbenchmarkevent.cpp b/src/testlib/qbenchmarkevent.cpp index 60cd302..4f4e203 100644 --- a/src/testlib/qbenchmarkevent.cpp +++ b/src/testlib/qbenchmarkevent.cpp @@ -41,6 +41,7 @@ #include "QtTest/private/qbenchmarkevent_p.h" #include "QtTest/private/qbenchmark_p.h" +#include "QtTest/private/qbenchmarkmetric_p.h" #include <qdebug.h> QT_BEGIN_NAMESPACE @@ -91,14 +92,9 @@ int QBenchmarkEvent::adjustMedianCount(int suggestion) return 1; } -QString QBenchmarkEvent::unitText() +QTest::QBenchmarkMetric QBenchmarkEvent::metricType() { - return QLatin1String("events"); -} - -QString QBenchmarkEvent::metricText() -{ - return QLatin1String("events"); + return QTest::Events; } // This could be done in a much better way, this is just the beginning. |