summaryrefslogtreecommitdiffstats
path: root/src/testlib
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@nokia.com>2010-05-28 09:55:47 (GMT)
committerSamuel Rødal <samuel.rodal@nokia.com>2010-05-28 10:27:57 (GMT)
commit60c12264b0ff01bb4888323b3acda0bc581021a7 (patch)
tree809a134a280e5d3102487676a7ceee4f06549603 /src/testlib
parentfa7dfb24c2d165cad438eb28c83ac2fd60831b29 (diff)
downloadQt-60c12264b0ff01bb4888323b3acda0bc581021a7.zip
Qt-60c12264b0ff01bb4888323b3acda0bc581021a7.tar.gz
Qt-60c12264b0ff01bb4888323b3acda0bc581021a7.tar.bz2
Fixed bug where testlib would not respect the -iterations option.
Reviewed-by: Morten Sørvig
Diffstat (limited to 'src/testlib')
-rw-r--r--src/testlib/qbenchmark.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/testlib/qbenchmark.cpp b/src/testlib/qbenchmark.cpp
index 23c5639..c88ecb0 100644
--- a/src/testlib/qbenchmark.cpp
+++ b/src/testlib/qbenchmark.cpp
@@ -159,7 +159,7 @@ void QBenchmarkTestMethodData::setResult(
if (QBenchmarkGlobalData::current->iterationCount != -1)
accepted = true;
- if (QBenchmarkTestMethodData::current->runOnce || !setByMacro) {
+ else if (QBenchmarkTestMethodData::current->runOnce || !setByMacro) {
iterationCount = 1;
accepted = true;
}