diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-29 16:41:59 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-29 16:52:58 +0100 |
| commit | b684ba219493fb7b0108ae367d6d033aaa28053b (patch) | |
| tree | f1fec8922da198e231416b50ef8f441ef6db065b /tests/benchmarks | |
| parent | 97a5cf86345fd72cdff83c03664c19a8f5cdf79a (diff) | |
| parent | 8354851b628ebae567a9125cbd0ba69268470c1b (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
dependencies.yaml
Change-Id: Ie3e9dc62031a85e5e81cbdf04694b95159d49fca
Diffstat (limited to 'tests/benchmarks')
| -rw-r--r-- | tests/benchmarks/qml/holistic/testtypes.h | 1 | ||||
| -rw-r--r-- | tests/benchmarks/qml/painting/painting.pro | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/benchmarks/qml/holistic/testtypes.h b/tests/benchmarks/qml/holistic/testtypes.h index 6ff64c645d..55f094ae7e 100644 --- a/tests/benchmarks/qml/holistic/testtypes.h +++ b/tests/benchmarks/qml/holistic/testtypes.h @@ -36,7 +36,6 @@ #include <QtQml/qqmllist.h> #include <QtCore/qrandom.h> #include <QtCore/qrect.h> -#include <QtGui/qmatrix.h> #include <QtGui/qcolor.h> #include <QtGui/qpixmap.h> #include <QtGui/qvector3d.h> diff --git a/tests/benchmarks/qml/painting/painting.pro b/tests/benchmarks/qml/painting/painting.pro index 7e97915f43..633be76e30 100644 --- a/tests/benchmarks/qml/painting/painting.pro +++ b/tests/benchmarks/qml/painting/painting.pro @@ -1,6 +1,7 @@ requires(qtHaveModule(opengl)) +requires(qtHaveModule(widgets)) -QT += opengl +QT += opengl widgets CONFIG += console macx:CONFIG -= app_bundle |