projects / profile / ivi / qtbase.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bf4177e)
Fix -tickcounter in qtestlib.
authorRobin Burchell <robin.burchell@collabora.com>
Fri, 16 Dec 2011 17:32:46 +0000 (18:32 +0100)
committerQt by Nokia <qt-info@nokia.com>
Wed, 21 Dec 2011 06:50:30 +0000 (07:50 +0100)
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 patch | blob | history

diff --git a/src/testlib/qbenchmarkmeasurement_p.h b/src/testlib/qbenchmarkmeasurement_p.h
index 53e44fd..c493d96 100644 (file)
--- 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
Domain: UI Framework / Uncategorized;