diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-20 01:00:27 +0100 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-01-20 07:04:47 +0000 |
| commit | b9519d9630d9192cb49b97c7c9fe30d43ab1ee4a (patch) | |
| tree | 512b32a0e2dea84a89a01e89a1b7868f3c1c8a37 /tests/benchmarks | |
| parent | 0ced82a8cf8472a79b08db05d441caf778ac9131 (diff) | |
| parent | e5f7c5f2712957d0e1753c629e4cce86a0e6bdbc (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/qml/qml/qqmlvaluetype.cpp
tests/auto/qml/qml.pro
Change-Id: I78f992f83212bb9fd5e09b64163f15f046185224
Diffstat (limited to 'tests/benchmarks')
| -rw-r--r-- | tests/benchmarks/qml/holistic/testtypes.h | 1 |
1 files changed, 0 insertions, 1 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> |