summaryrefslogtreecommitdiffstats
path: root/src/testlib
diff options
context:
space:
mode:
authorEckhart Koppen <eckhart.koppen@nokia.com>2011-06-13 14:41:03 +0300
committerQt Continuous Integration System <qt-info@nokia.com>2011-06-13 15:45:18 +0200
commita37f8e08ec295fe25b9ac663b8cda8109a1c38cf (patch)
treee5e9c09f22c5f4f61afc4d229cba6f22eefb3eea /src/testlib
parentfd1411a8e5ec46f7841608f4baf13c7a16535a79 (diff)
Include cycle_p.h only conditionally
cycle_p.h is only needed when HAVE_TICK_COUNTER is defined, and should not be included otherwise. It is also a 3rd party header which is not exported as a private header so far, which makes compilation of dependenty modules fail. Change-Id: I5c2546eae7d65fc68b8411c20634aca541c327d6 Reviewed-on: http://codereview.qt.nokia.com/465 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Diffstat (limited to 'src/testlib')
-rw-r--r--src/testlib/qbenchmarkmeasurement_p.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/testlib/qbenchmarkmeasurement_p.h b/src/testlib/qbenchmarkmeasurement_p.h
index a4b676fd72..8242365f20 100644
--- a/src/testlib/qbenchmarkmeasurement_p.h
+++ b/src/testlib/qbenchmarkmeasurement_p.h
@@ -54,7 +54,9 @@
//
#include <QtCore/qelapsedtimer.h>
+#ifdef HAVE_TICK_COUNTER
#include "3rdparty/cycle_p.h"
+#endif
#include "qbenchmark.h"
QT_BEGIN_NAMESPACE