diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2020-01-28 18:27:28 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-01-28 18:28:27 +0100 |
commit | 4cbadf699838406d14366ce61deec03cf45113f7 (patch) | |
tree | b4f22e81025a584aaef93f9a0919d7829bd77de2 /tests/auto/gui/image/qpixmap/tst_qpixmap.cpp | |
parent | QOpenGLContext: use extraFunctions instead of versioned functions (diff) | |
parent | Merge remote-tracking branch 'origin/5.15' into dev (diff) | |
download | qtbase-4cbadf699838406d14366ce61deec03cf45113f7.tar.xz qtbase-4cbadf699838406d14366ce61deec03cf45113f7.zip |
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
Diffstat (limited to 'tests/auto/gui/image/qpixmap/tst_qpixmap.cpp')
-rw-r--r-- | tests/auto/gui/image/qpixmap/tst_qpixmap.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp index ba5df809f2..1d77f70919 100644 --- a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp +++ b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp @@ -32,7 +32,6 @@ #include <qbitmap.h> #include <qimage.h> #include <qimagereader.h> -#include <qmatrix.h> #ifndef QT_NO_WIDGETS #include <qdesktopwidget.h> #include <qsplashscreen.h> |