diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-05-31 11:53:27 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-05-31 11:53:27 (GMT) |
| commit | 312fc45afc6829cf4af54f03d59548350d7be4e0 (patch) | |
| tree | 74594f9e2e0df61592b4f45e483f1526bff58a31 /src/testlib/qbenchmark.cpp | |
| parent | 39317d9583a4def0b7d1085778e302a8ccb3be86 (diff) | |
| parent | 50958288e4493920f18ef9f9b062e01bd4782239 (diff) | |
| download | Qt-312fc45afc6829cf4af54f03d59548350d7be4e0.zip Qt-312fc45afc6829cf4af54f03d59548350d7be4e0.tar.gz Qt-312fc45afc6829cf4af54f03d59548350d7be4e0.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/testlib/qbenchmark.cpp')
| -rw-r--r-- | src/testlib/qbenchmark.cpp | 2 |
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; } |