From f07d97150549f6817c351643e1c8b0ff163803ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <sroedal@trolltech.com>
Date: Wed, 17 Feb 2010 12:47:08 +0100
Subject: Always accept values reported directly using
 QTest::setBenchmarkResult.

Reviewed-by: jasplin
---
 src/testlib/qbenchmark.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
     }
-- 
cgit v0.12