From a09fdd91cf16e3e6a623197e192458a32e671a1f Mon Sep 17 00:00:00 2001
From: Robin Burchell <robin.burchell@collabora.com>
Date: Fri, 16 Dec 2011 18:32:46 +0100
Subject: Fix -tickcounter in qtestlib.

HAVE_TICK_COUNTER is supposed to be set (if possible) from cycle_p.h, so
guarding cycle_p.h's inclusion with HAVE_TICK_COUNTER ensures it will never be
set.

Change-Id: I6313d0a2efd47c89522623e8e7b3f505489ded90
Reviewed-by: David Faure <faure@kde.org>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
---
 src/testlib/qbenchmarkmeasurement_p.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/testlib/qbenchmarkmeasurement_p.h b/src/testlib/qbenchmarkmeasurement_p.h
index 53e44fd531..c493d96dd6 100644
--- a/src/testlib/qbenchmarkmeasurement_p.h
+++ b/src/testlib/qbenchmarkmeasurement_p.h
@@ -54,9 +54,7 @@
 //
 
 #include <QtCore/qelapsedtimer.h>
-#ifdef HAVE_TICK_COUNTER
 #include <QtTest/private/cycle_p.h>
-#endif
 #include <QtTest/qbenchmark.h>
 
 QT_BEGIN_NAMESPACE
-- 
cgit v1.2.3