diff options
Diffstat (limited to 'tests/auto/widgets/graphicsview')
19 files changed, 29 insertions, 19 deletions
diff --git a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp index f755b4eb76..92cffa0226 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <QtWidgets/qgraphicsanchorlayout.h> #include <private/qgraphicsanchorlayout_p.h> #include <QtWidgets/qgraphicswidget.h> diff --git a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp index 840db1c364..9e0293d875 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ #include <QtGui> -#include <QtTest/QtTest> +#include <QTest> #include <QTest> #include <QMetaType> #include <QtWidgets/qgraphicsanchorlayout.h> diff --git a/tests/auto/widgets/graphicsview/qgraphicseffectsource/tst_qgraphicseffectsource.cpp b/tests/auto/widgets/graphicsview/qgraphicseffectsource/tst_qgraphicseffectsource.cpp index 5df8b7c1ac..ba8a309674 100644 --- a/tests/auto/widgets/graphicsview/qgraphicseffectsource/tst_qgraphicseffectsource.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicseffectsource/tst_qgraphicseffectsource.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <QtWidgets/qgraphicseffect.h> #include <QtWidgets/qgraphicsview.h> #include <QtWidgets/qgraphicsscene.h> diff --git a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp index 986ef2a126..effd8a28c1 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <qgraphicsgridlayout.h> #include <qgraphicswidget.h> #include <qgraphicsscene.h> diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp index ab89a94a10..81e95cc3df 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <QtTest/private/qtesthelpers_p.h> #include <private/qgraphicsitem_p.h> @@ -60,6 +60,8 @@ #include <float.h> #include <QStyleHints> #include <QPainterPath> +#include <QSignalSpy> +#include <QTimer> using AbstractGraphicsShapeItemPtr = QSharedPointer<QAbstractGraphicsShapeItem>; using GraphicsItems = QList<QGraphicsItem *>; diff --git a/tests/auto/widgets/graphicsview/qgraphicsitemanimation/tst_qgraphicsitemanimation.cpp b/tests/auto/widgets/graphicsview/qgraphicsitemanimation/tst_qgraphicsitemanimation.cpp index 0d8e5b4d54..46e834afdb 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsitemanimation/tst_qgraphicsitemanimation.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsitemanimation/tst_qgraphicsitemanimation.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <qgraphicsitemanimation.h> #include <QtCore/qtimeline.h> diff --git a/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp b/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp index 7143dec0a1..167f418c3d 100644 --- a/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <QtGui> #include <QtWidgets> #include <math.h> diff --git a/tests/auto/widgets/graphicsview/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp b/tests/auto/widgets/graphicsview/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp index 2d8bf40ee5..7e0a8b6033 100644 --- a/tests/auto/widgets/graphicsview/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <qgraphicslayoutitem.h> #include <float.h> #include <limits.h> diff --git a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp index 4371347475..eef554ad87 100644 --- a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <qgraphicslinearlayout.h> #include <qgraphicsproxywidget.h> #include <qgraphicswidget.h> diff --git a/tests/auto/widgets/graphicsview/qgraphicsobject/tst_qgraphicsobject.cpp b/tests/auto/widgets/graphicsview/qgraphicsobject/tst_qgraphicsobject.cpp index 482ce7d244..58c965a7d0 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsobject/tst_qgraphicsobject.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsobject/tst_qgraphicsobject.cpp @@ -27,7 +27,9 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> +#include <QSignalSpy> + #include <qgraphicsitem.h> #include <qgraphicsscene.h> #include <qgraphicssceneevent.h> diff --git a/tests/auto/widgets/graphicsview/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp b/tests/auto/widgets/graphicsview/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp index a8f5e396e8..22b81773b9 100644 --- a/tests/auto/widgets/graphicsview/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <qgraphicsscene.h> #include <qgraphicsitem.h> #include <qpainterpath.h> diff --git a/tests/auto/widgets/graphicsview/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp b/tests/auto/widgets/graphicsview/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp index 9f0d47223b..90d69ca853 100644 --- a/tests/auto/widgets/graphicsview/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <qgraphicsitem.h> #include <qpainterpath.h> #include <qpen.h> diff --git a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp index 7cb441a925..e9ba24f4fc 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <QtGui> #include <QtWidgets> #include <private/qgraphicsproxywidget_p.h> diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp index 21f1bee537..bfb746ed95 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp @@ -40,7 +40,11 @@ #include <QtGui/QPainterPath> #include <QtGui/QScreen> -#include <QtTest/QtTest> +#include <QTest> +#include <QTestEventLoop> +#include <QRandomGenerator> +#include <QSignalSpy> +#include <QMimeData> #include <QtCore/QDebug> #include <QtCore/QLoggingCategory> diff --git a/tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp b/tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp index 640e0418e5..9645b9a7fb 100644 --- a/tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <QtGui/QPainterPath> #include <QtWidgets/qgraphicsscene.h> #include <private/qgraphicsscenebsptreeindex_p.h> diff --git a/tests/auto/widgets/graphicsview/qgraphicstransform/tst_qgraphicstransform.cpp b/tests/auto/widgets/graphicsview/qgraphicstransform/tst_qgraphicstransform.cpp index d23ccedc6f..5d5323a3a2 100644 --- a/tests/auto/widgets/graphicsview/qgraphicstransform/tst_qgraphicstransform.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicstransform/tst_qgraphicstransform.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <qgraphicsitem.h> #include <qgraphicstransform.h> diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp index 41d29e9b7b..e666ac24c9 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp @@ -27,7 +27,9 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> +#include <QSignalSpy> +#include <QTimer> #include <qgraphicsitem.h> #include <qgraphicsscene.h> diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview_2.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview_2.cpp index 5c9134a3b0..72b5acc654 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview_2.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview_2.cpp @@ -25,7 +25,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <QtCore/QSize> #include <QtCore/QRectF> #include <QtGui/QTransform> diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp index f31b82b2bb..c22195fada 100644 --- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <qgraphicswidget.h> #include <qgraphicsscene.h> #include <qgraphicssceneevent.h> |