diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:45:06 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-30 09:17:43 +0100 |
| commit | 1320f7f9840e94db66988f2dce265dfd373add27 (patch) | |
| tree | 59d191178b86522b19fff44c592ac905326d86b1 /tests/benchmarks | |
| parent | b2922baedd8b6a2aa1e6aa49a28e774e331c2be9 (diff) | |
| parent | 296810ea4bb4f734881a517eb101e5b948c1905b (diff) | |
| download | qtquickcontrols-1320f7f9840e94db66988f2dce265dfd373add27.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4
Conflicts:
.qmake.conf
Change-Id: Ia33462a31303ae79f7a6ef26dc6065a0afeef3e1
Diffstat (limited to 'tests/benchmarks')
| -rw-r--r-- | tests/benchmarks/startup/startup_bench.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/benchmarks/startup/startup_bench.cpp b/tests/benchmarks/startup/startup_bench.cpp index 4127f8d0..cdc754ec 100644 --- a/tests/benchmarks/startup/startup_bench.cpp +++ b/tests/benchmarks/startup/startup_bench.cpp @@ -52,6 +52,7 @@ #include <QtQml/QQmlApplicationEngine> #include <QtCore/QElapsedTimer> #include <functional> +#include <stdio.h> int runBenchmark(std::function<int()> f) { { |