summaryrefslogtreecommitdiffstats
path: root/src/testlib/qbenchmark.h
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2009-08-13 06:01:46 (GMT)
committerMartin Jones <martin.jones@nokia.com>2009-08-13 06:01:46 (GMT)
commita7f21de784bb50d61f299eb8d6d080a8c6fac6b5 (patch)
tree5c4f33495463b759bd6fb541fcf404f5ad081095 /src/testlib/qbenchmark.h
parent72f565838c5d9f8ee8984d2a7b3586b1d51e656d (diff)
parent6c3a6629de59898a3ea38181a1623896810c576e (diff)
downloadQt-a7f21de784bb50d61f299eb8d6d080a8c6fac6b5.zip
Qt-a7f21de784bb50d61f299eb8d6d080a8c6fac6b5.tar.gz
Qt-a7f21de784bb50d61f299eb8d6d080a8c6fac6b5.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/testlib/qbenchmark.h')
-rw-r--r--src/testlib/qbenchmark.h11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/testlib/qbenchmark.h b/src/testlib/qbenchmark.h
index c06bfc0..4c23695 100644
--- a/src/testlib/qbenchmark.h
+++ b/src/testlib/qbenchmark.h
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
@@ -64,7 +64,9 @@ namespace QTest
class Q_TESTLIB_EXPORT QBenchmarkIterationController
{
public:
+ enum RunMode { RepeatUntilValidMeasurement, RunOnce };
QBenchmarkIterationController();
+ QBenchmarkIterationController(RunMode runMode);
~QBenchmarkIterationController();
bool isDone();
void next();
@@ -74,7 +76,12 @@ public:
}
#define QBENCHMARK \
- for (QTest::QBenchmarkIterationController __iteration_controller; __iteration_controller.isDone() == false; __iteration_controller.next())
+ for (QTest::QBenchmarkIterationController __iteration_controller; \
+ __iteration_controller.isDone() == false; __iteration_controller.next())
+
+#define QBENCHMARK_ONCE \
+ for (QTest::QBenchmarkIterationController __iteration_controller(QTest::QBenchmarkIterationController::RunOnce); \
+ __iteration_controller.isDone() == false; __iteration_controller.next())
QT_END_NAMESPACE