summaryrefslogtreecommitdiffstats
path: root/src/testlib
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-02-20 07:42:16 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-02-20 07:42:16 (GMT)
commitf0eb658611f549470f0d90e141eda61ab9301838 (patch)
treee234b73e10490e297033d645b744a7cbd26da4b9 /src/testlib
parentba9c21f7a1398ddcdeee6f010b1477d79f5bb8ce (diff)
parent8f10ca802dee1ed110f301191c4a56a85575033c (diff)
downloadQt-f0eb658611f549470f0d90e141eda61ab9301838.zip
Qt-f0eb658611f549470f0d90e141eda61ab9301838.tar.gz
Qt-f0eb658611f549470f0d90e141eda61ab9301838.tar.bz2
Merge remote branch 'origin/master'
Conflicts: doc/src/declarative/advtutorial1.qdoc
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 52b5287..23c5639 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) {
+ if (QBenchmarkTestMethodData::current->runOnce || !setByMacro) {
iterationCount = 1;
accepted = true;
}