diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-10-13 09:18:05 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-10-19 06:21:51 +0000 |
| commit | f939e7ea7375dbc051c81abf7b24c6fd5304cbbb (patch) | |
| tree | 5f7d1692b017cb5f8fd35ea92285b23e69cfeb50 /src/testlib/qbenchmark.cpp | |
| parent | 6a7b683817e7427cf952130b7726833fd5be74ce (diff) | |
Testlib: Move classes inheriting QBenchmarkMeasurerBase to separate header
QBenchmarkTimeMeasurer uses the 3rd party header cycle_p.h which may
include windows.h on Windows (32bit). This can cause clashes in qmltest,
which uses QBenchmarkMeasurerBase. Move the derived classes to a separate
header to prevent this.
Change-Id: I943a11c32a575594e6e79e722e8809b42de35092
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/testlib/qbenchmark.cpp')
| -rw-r--r-- | src/testlib/qbenchmark.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/testlib/qbenchmark.cpp b/src/testlib/qbenchmark.cpp index c884d5d740..c933a16c35 100644 --- a/src/testlib/qbenchmark.cpp +++ b/src/testlib/qbenchmark.cpp @@ -40,6 +40,7 @@ #include <QtTest/qbenchmark.h> #include <QtTest/private/qbenchmark_p.h> #include <QtTest/private/qbenchmarkmetric_p.h> +#include <QtTest/private/qbenchmarktimemeasurers_p.h> #include <QtCore/qprocess.h> #include <QtCore/qdir.h> |