summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui/painting
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/gui/painting')
-rw-r--r--tests/auto/gui/painting/qbrush/tst_qbrush.cpp2
-rw-r--r--tests/auto/gui/painting/qcolor/tst_qcolor.cpp3
-rw-r--r--tests/auto/gui/painting/qcolorspace/tst_qcolorspace.cpp2
-rw-r--r--tests/auto/gui/painting/qpagelayout/tst_qpagelayout.cpp2
-rw-r--r--tests/auto/gui/painting/qpageranges/tst_qpageranges.cpp2
-rw-r--r--tests/auto/gui/painting/qpagesize/tst_qpagesize.cpp2
-rw-r--r--tests/auto/gui/painting/qpaintengine/tst_qpaintengine.cpp2
-rw-r--r--tests/auto/gui/painting/qpainter/tst_qpainter.cpp2
-rw-r--r--tests/auto/gui/painting/qpainterpath/tst_qpainterpath.cpp2
-rw-r--r--tests/auto/gui/painting/qpainterpathstroker/tst_qpainterpathstroker.cpp2
-rw-r--r--tests/auto/gui/painting/qpathclipper/tst_qpathclipper.cpp2
-rw-r--r--tests/auto/gui/painting/qpdfwriter/tst_qpdfwriter.cpp4
-rw-r--r--tests/auto/gui/painting/qpen/tst_qpen.cpp2
-rw-r--r--tests/auto/gui/painting/qpolygon/tst_qpolygon.cpp2
-rw-r--r--tests/auto/gui/painting/qregion/tst_qregion.cpp2
-rw-r--r--tests/auto/gui/painting/qtransform/tst_qtransform.cpp2
16 files changed, 19 insertions, 16 deletions
diff --git a/tests/auto/gui/painting/qbrush/tst_qbrush.cpp b/tests/auto/gui/painting/qbrush/tst_qbrush.cpp
index ac357c92db..490d127efc 100644
--- a/tests/auto/gui/painting/qbrush/tst_qbrush.cpp
+++ b/tests/auto/gui/painting/qbrush/tst_qbrush.cpp
@@ -27,7 +27,7 @@
****************************************************************************/
-#include <QtTest/QtTest>
+#include <QTest>
#include "qbrush.h"
#include <QPainter>
diff --git a/tests/auto/gui/painting/qcolor/tst_qcolor.cpp b/tests/auto/gui/painting/qcolor/tst_qcolor.cpp
index 40d42806a8..a5a2983ce7 100644
--- a/tests/auto/gui/painting/qcolor/tst_qcolor.cpp
+++ b/tests/auto/gui/painting/qcolor/tst_qcolor.cpp
@@ -27,7 +27,8 @@
****************************************************************************/
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QFloat16>
#include <limits.h>
diff --git a/tests/auto/gui/painting/qcolorspace/tst_qcolorspace.cpp b/tests/auto/gui/painting/qcolorspace/tst_qcolorspace.cpp
index 4acbfbba74..f484187315 100644
--- a/tests/auto/gui/painting/qcolorspace/tst_qcolorspace.cpp
+++ b/tests/auto/gui/painting/qcolorspace/tst_qcolorspace.cpp
@@ -27,7 +27,7 @@
****************************************************************************/
-#include <QtTest/QtTest>
+#include <QTest>
#include <qcolorspace.h>
#include <qimage.h>
diff --git a/tests/auto/gui/painting/qpagelayout/tst_qpagelayout.cpp b/tests/auto/gui/painting/qpagelayout/tst_qpagelayout.cpp
index 478b482064..830e0cd16c 100644
--- a/tests/auto/gui/painting/qpagelayout/tst_qpagelayout.cpp
+++ b/tests/auto/gui/painting/qpagelayout/tst_qpagelayout.cpp
@@ -26,7 +26,7 @@
**
****************************************************************************/
-#include <QtTest/QtTest>
+#include <QTest>
#include <QtGui/qpagelayout.h>
class tst_QPageLayout : public QObject
diff --git a/tests/auto/gui/painting/qpageranges/tst_qpageranges.cpp b/tests/auto/gui/painting/qpageranges/tst_qpageranges.cpp
index 953f1c472a..4912aa43c1 100644
--- a/tests/auto/gui/painting/qpageranges/tst_qpageranges.cpp
+++ b/tests/auto/gui/painting/qpageranges/tst_qpageranges.cpp
@@ -26,7 +26,7 @@
**
****************************************************************************/
-#include <QtTest/QtTest>
+#include <QTest>
#include <qpageranges.h>
typedef QList<QPageRanges::Range> PageRangeList;
diff --git a/tests/auto/gui/painting/qpagesize/tst_qpagesize.cpp b/tests/auto/gui/painting/qpagesize/tst_qpagesize.cpp
index 6b49a14ddf..838f7e59cd 100644
--- a/tests/auto/gui/painting/qpagesize/tst_qpagesize.cpp
+++ b/tests/auto/gui/painting/qpagesize/tst_qpagesize.cpp
@@ -26,7 +26,7 @@
**
****************************************************************************/
-#include <QtTest/QtTest>
+#include <QTest>
#include <QtGlobal>
#include <QtAlgorithms>
#include <QtGui/QPageSize>
diff --git a/tests/auto/gui/painting/qpaintengine/tst_qpaintengine.cpp b/tests/auto/gui/painting/qpaintengine/tst_qpaintengine.cpp
index d6b532887f..4363799702 100644
--- a/tests/auto/gui/painting/qpaintengine/tst_qpaintengine.cpp
+++ b/tests/auto/gui/painting/qpaintengine/tst_qpaintengine.cpp
@@ -27,7 +27,7 @@
****************************************************************************/
-#include <QtTest/QtTest>
+#include <QTest>
#include <qcoreapplication.h>
#include <qdebug.h>
diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
index c777a90282..30ce4fcfa8 100644
--- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
+++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
@@ -27,7 +27,7 @@
****************************************************************************/
-#include <QtTest/QtTest>
+#include <QTest>
#include <qpainter.h>
#ifndef QT_NO_WIDGETS
#include <qdrawutil.h>
diff --git a/tests/auto/gui/painting/qpainterpath/tst_qpainterpath.cpp b/tests/auto/gui/painting/qpainterpath/tst_qpainterpath.cpp
index f96ed563d3..12a8fff33b 100644
--- a/tests/auto/gui/painting/qpainterpath/tst_qpainterpath.cpp
+++ b/tests/auto/gui/painting/qpainterpath/tst_qpainterpath.cpp
@@ -27,7 +27,7 @@
****************************************************************************/
-#include <QtTest/QtTest>
+#include <QTest>
#include <qfile.h>
#include <qpainterpath.h>
diff --git a/tests/auto/gui/painting/qpainterpathstroker/tst_qpainterpathstroker.cpp b/tests/auto/gui/painting/qpainterpathstroker/tst_qpainterpathstroker.cpp
index f0bb9a880a..de3f612b10 100644
--- a/tests/auto/gui/painting/qpainterpathstroker/tst_qpainterpathstroker.cpp
+++ b/tests/auto/gui/painting/qpainterpathstroker/tst_qpainterpathstroker.cpp
@@ -27,7 +27,7 @@
****************************************************************************/
-#include <QtTest/QtTest>
+#include <QTest>
#include <qfile.h>
#include <QPainterPathStroker>
diff --git a/tests/auto/gui/painting/qpathclipper/tst_qpathclipper.cpp b/tests/auto/gui/painting/qpathclipper/tst_qpathclipper.cpp
index 01853d841a..83a8d6bd47 100644
--- a/tests/auto/gui/painting/qpathclipper/tst_qpathclipper.cpp
+++ b/tests/auto/gui/painting/qpathclipper/tst_qpathclipper.cpp
@@ -29,7 +29,7 @@
#include "paths.h"
#include "pathcompare.h"
-#include <QtTest/QtTest>
+#include <QTest>
#include <qpainterpath.h>
#include <qpolygon.h>
diff --git a/tests/auto/gui/painting/qpdfwriter/tst_qpdfwriter.cpp b/tests/auto/gui/painting/qpdfwriter/tst_qpdfwriter.cpp
index 8c98a8ad98..c74baf0ba4 100644
--- a/tests/auto/gui/painting/qpdfwriter/tst_qpdfwriter.cpp
+++ b/tests/auto/gui/painting/qpdfwriter/tst_qpdfwriter.cpp
@@ -26,9 +26,11 @@
**
****************************************************************************/
-#include <QtTest/QtTest>
+#include <QTest>
#include <QtGlobal>
#include <QtAlgorithms>
+#include <QTemporaryFile>
+
#include <QtGui/QAbstractTextDocumentLayout>
#include <QtGui/QPageLayout>
#include <QtGui/QPdfWriter>
diff --git a/tests/auto/gui/painting/qpen/tst_qpen.cpp b/tests/auto/gui/painting/qpen/tst_qpen.cpp
index 295ae27d17..64c01a81b5 100644
--- a/tests/auto/gui/painting/qpen/tst_qpen.cpp
+++ b/tests/auto/gui/painting/qpen/tst_qpen.cpp
@@ -27,7 +27,7 @@
****************************************************************************/
-#include <QtTest/QtTest>
+#include <QTest>
#include "qpen.h"
#include "qbrush.h"
diff --git a/tests/auto/gui/painting/qpolygon/tst_qpolygon.cpp b/tests/auto/gui/painting/qpolygon/tst_qpolygon.cpp
index a33e1559de..4cde0aa549 100644
--- a/tests/auto/gui/painting/qpolygon/tst_qpolygon.cpp
+++ b/tests/auto/gui/painting/qpolygon/tst_qpolygon.cpp
@@ -27,7 +27,7 @@
****************************************************************************/
-#include <QtTest/QtTest>
+#include <QTest>
#include <qpolygon.h>
#include <qpainterpath.h>
diff --git a/tests/auto/gui/painting/qregion/tst_qregion.cpp b/tests/auto/gui/painting/qregion/tst_qregion.cpp
index 27327d8d1a..29179c44a0 100644
--- a/tests/auto/gui/painting/qregion/tst_qregion.cpp
+++ b/tests/auto/gui/painting/qregion/tst_qregion.cpp
@@ -27,7 +27,7 @@
****************************************************************************/
-#include <QtTest/QtTest>
+#include <QTest>
#include <qregion.h>
#include <qbitmap.h>
diff --git a/tests/auto/gui/painting/qtransform/tst_qtransform.cpp b/tests/auto/gui/painting/qtransform/tst_qtransform.cpp
index a3ff1b0081..1bab7200f0 100644
--- a/tests/auto/gui/painting/qtransform/tst_qtransform.cpp
+++ b/tests/auto/gui/painting/qtransform/tst_qtransform.cpp
@@ -27,7 +27,7 @@
****************************************************************************/
-#include <QtTest/QtTest>
+#include <QTest>
#include <qpainterpath.h>
#include <qpolygon.h>
#include <qtransform.h>