Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | QtTest: Add missing override | Alexander Volkov | 2016-12-01 | 1 | -16/+16 |
| | | | | | Change-Id: Ibb924f11b82577fb67aa7a1a30b81f4d8d7d36fc Reviewed-by: hjk <hjk@qt.io> | ||||
* | Testlib: Move classes inheriting QBenchmarkMeasurerBase to separate header | Friedemann Kleint | 2016-10-19 | 1 | -0/+96 |
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> |