summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2010-02-22 11:07:10 (GMT)
committerMartin Smith <msmith@trolltech.com>2010-02-22 11:07:10 (GMT)
commit958ce5f41e3a9580ea0bdd99ca84dfdffbb85bf5 (patch)
tree2cb577d9e8016592d862452d5c05ee2e72ef549f /src
parent88259a37599cad4756299d729b9a733cf4b0e528 (diff)
parent79a53db37f76e3cc3687b0c7742a89260a736640 (diff)
downloadQt-958ce5f41e3a9580ea0bdd99ca84dfdffbb85bf5.zip
Qt-958ce5f41e3a9580ea0bdd99ca84dfdffbb85bf5.tar.gz
Qt-958ce5f41e3a9580ea0bdd99ca84dfdffbb85bf5.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1
Diffstat (limited to 'src')
-rw-r--r--src/testlib/qbenchmark.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/testlib/qbenchmark.h b/src/testlib/qbenchmark.h
index 38a0e52..46f51ca 100644
--- a/src/testlib/qbenchmark.h
+++ b/src/testlib/qbenchmark.h
@@ -43,7 +43,7 @@
#define QBENCHMARK_H
#include <QtTest/qtest_global.h>
-#include <QtTest/private/qbenchmarkmetric_p.h>
+#include <QtTest/qbenchmarkmetric.h>
QT_BEGIN_HEADER