diff options
Diffstat (limited to 'tests/benchmarks/gui')
25 files changed, 50 insertions, 19 deletions
diff --git a/tests/benchmarks/gui/animation/qanimation/main.cpp b/tests/benchmarks/gui/animation/qanimation/main.cpp index b203949ed5..90d2a1c008 100644 --- a/tests/benchmarks/gui/animation/qanimation/main.cpp +++ b/tests/benchmarks/gui/animation/qanimation/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include <qtest.h> #include "dummyobject.h" diff --git a/tests/benchmarks/gui/animation/qanimation/qanimation.pro b/tests/benchmarks/gui/animation/qanimation/qanimation.pro index 53a139a660..6efd2c1d8b 100644 --- a/tests/benchmarks/gui/animation/qanimation/qanimation.pro +++ b/tests/benchmarks/gui/animation/qanimation/qanimation.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets TEMPLATE = app TARGET = tst_bench_qanimation DEPENDPATH += . diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro b/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro index 3ede6e8c85..df8248e431 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro +++ b/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets TEMPLATE = app TARGET = tst_bench_qgraphicsanchorlayout diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp index e879b3efb9..b34ed0d092 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp +++ b/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp @@ -40,10 +40,10 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include <QtGui/qgraphicsanchorlayout.h> -#include <QtGui/qgraphicslinearlayout.h> -#include <QtGui/qgraphicswidget.h> -#include <QtGui/qgraphicsview.h> +#include <QtWidgets/qgraphicsanchorlayout.h> +#include <QtWidgets/qgraphicslinearlayout.h> +#include <QtWidgets/qgraphicswidget.h> +#include <QtWidgets/qgraphicsview.h> class tst_QGraphicsAnchorLayout : public QObject { diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro b/tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro index d4935c0c6a..ac8a5d2517 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro +++ b/tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets TEMPLATE = app TARGET = tst_bench_qgraphicsitem diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro b/tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro index 1b7a5dc641..3b168f2c16 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro +++ b/tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets TEMPLATE = app TARGET = tst_bench_qgraphicsscene diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chip.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chip.cpp index acc056eefe..3e6ec440d9 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chip.cpp +++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chip.cpp @@ -41,7 +41,7 @@ #include "chip.h" -#include <QtGui> +#include <QtWidgets> Chip::Chip(const QColor &color, int x, int y) { diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chip.h b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chip.h index 4bd1b172f3..09facb7f90 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chip.h +++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chip.h @@ -43,7 +43,7 @@ #define CHIP_H #include <QtGui/QColor> -#include <QtGui/QGraphicsItem> +#include <QtWidgets/QGraphicsItem> class Chip : public QGraphicsItem { diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.h b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.h index 805e2f471d..af93b634f5 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.h +++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.h @@ -42,7 +42,9 @@ #ifndef CHIPTESTER_H #define CHIPTESTER_H -#include <QtGui> +#include <QtWidgets/QGraphicsView> +#include <QtCore/QEventLoop> +#include <QtCore/QTime> QT_FORWARD_DECLARE_CLASS(QGraphicsScene) QT_FORWARD_DECLARE_CLASS(QGraphicsView) diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.pri b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.pri index a9e0bf8272..8d02504b73 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.pri +++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.pri @@ -9,4 +9,5 @@ HEADERS += \ RESOURCES += \ chiptester/images.qrc +QT += widgets contains(QT_CONFIG, opengl) QT += opengl diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro b/tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro index bfa374cdf8..0a9536a74f 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro +++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets TEMPLATE = app TARGET = tst_bench_qgraphicsview diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp index d2e0c917ec..aca8c1466a 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp @@ -40,11 +40,13 @@ ****************************************************************************/ #include <qtest.h> -#include <QDebug> -#include <QGraphicsItem> -#include <QGraphicsScene> -#include <QGraphicsView> -#include <QImage> +#include <QtCore/QDebug> +#include <QtWidgets/QGraphicsItem> +#include <QtWidgets/QGraphicsScene> +#include <QtWidgets/QGraphicsView> +#include <QtGui/QImage> +#include <QtGui/QPixmapCache> +#include <QtWidgets/QDesktopWidget> #include "chiptester/chiptester.h" //#define CALLGRIND_DEBUG diff --git a/tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro b/tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro index ed532377a1..367625dee6 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro +++ b/tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets TEMPLATE = app TARGET = tst_bench_qgraphicswidget TEMPLATE = app diff --git a/tests/benchmarks/gui/gui.pro b/tests/benchmarks/gui/gui.pro index d8254583c5..9cf701fa33 100644 --- a/tests/benchmarks/gui/gui.pro +++ b/tests/benchmarks/gui/gui.pro @@ -15,4 +15,4 @@ TRUSTED_BENCHMARKS += \ graphicsview/qgraphicsview \ painting/qtracebench -include(../trusted-benchmarks.pri)
\ No newline at end of file +include(../trusted-benchmarks.pri) diff --git a/tests/benchmarks/gui/image/qimagereader/qimagereader.pro b/tests/benchmarks/gui/image/qimagereader/qimagereader.pro index db5ffcd01d..0fb1e2509d 100644 --- a/tests/benchmarks/gui/image/qimagereader/qimagereader.pro +++ b/tests/benchmarks/gui/image/qimagereader/qimagereader.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets TEMPLATE = app TARGET = tst_bench_qimagereader diff --git a/tests/benchmarks/gui/itemviews/qtableview/qtableview.pro b/tests/benchmarks/gui/itemviews/qtableview/qtableview.pro index 3f4d4e135c..23383b0953 100644 --- a/tests/benchmarks/gui/itemviews/qtableview/qtableview.pro +++ b/tests/benchmarks/gui/itemviews/qtableview/qtableview.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets TEMPLATE = app TARGET = tst_bench_qtableview diff --git a/tests/benchmarks/gui/kernel/qapplication/qapplication.pro b/tests/benchmarks/gui/kernel/qapplication/qapplication.pro index e12a60c54c..ad424015e2 100644 --- a/tests/benchmarks/gui/kernel/qapplication/qapplication.pro +++ b/tests/benchmarks/gui/kernel/qapplication/qapplication.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets TEMPLATE = app TARGET = tst_bench_qapplication DEPENDPATH += . diff --git a/tests/benchmarks/gui/kernel/qwidget/qwidget.pro b/tests/benchmarks/gui/kernel/qwidget/qwidget.pro index 4c6e5c724d..1637bcddbe 100644 --- a/tests/benchmarks/gui/kernel/qwidget/qwidget.pro +++ b/tests/benchmarks/gui/kernel/qwidget/qwidget.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets TARGET = tst_bench_qwidget SOURCES += tst_qwidget.cpp diff --git a/tests/benchmarks/gui/kernel/qwidget/tst_qwidget.cpp b/tests/benchmarks/gui/kernel/qwidget/tst_qwidget.cpp index bcb1266490..86219210d1 100644 --- a/tests/benchmarks/gui/kernel/qwidget/tst_qwidget.cpp +++ b/tests/benchmarks/gui/kernel/qwidget/tst_qwidget.cpp @@ -40,7 +40,9 @@ ****************************************************************************/ #include <qtest.h> -#include <QtGui> + +#include <QtWidgets/QLayout> +#include <QtGui/QPainter> static void processEvents() { diff --git a/tests/benchmarks/gui/painting/qpainter/qpainter.pro b/tests/benchmarks/gui/painting/qpainter/qpainter.pro index 78b4f1a4e5..51a481df85 100644 --- a/tests/benchmarks/gui/painting/qpainter/qpainter.pro +++ b/tests/benchmarks/gui/painting/qpainter/qpainter.pro @@ -1,6 +1,7 @@ load(qttest_p4) -QT += gui-private +QT += widgets +QT += gui-private widgets-private TEMPLATE = app TARGET = tst_bench_qpainter diff --git a/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp b/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp index 895d7bff63..47016d5d12 100644 --- a/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp +++ b/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp @@ -45,6 +45,7 @@ #include <QDialog> #include <QImage> #include <QPaintEngine> +#include <QTileRules> #include <math.h> #ifndef M_PI #define M_PI 3.14159265358979323846 diff --git a/tests/benchmarks/gui/painting/qtbench/qtbench.pro b/tests/benchmarks/gui/painting/qtbench/qtbench.pro index 91f416de79..675f4477e2 100644 --- a/tests/benchmarks/gui/painting/qtbench/qtbench.pro +++ b/tests/benchmarks/gui/painting/qtbench/qtbench.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets TEMPLATE = app TARGET = tst_qtbench diff --git a/tests/benchmarks/gui/painting/qtracebench/qtracebench.pro b/tests/benchmarks/gui/painting/qtracebench/qtracebench.pro index 4f527f62b3..6384fc4cb7 100644 --- a/tests/benchmarks/gui/painting/qtracebench/qtracebench.pro +++ b/tests/benchmarks/gui/painting/qtracebench/qtracebench.pro @@ -1,6 +1,7 @@ load(qttest_p4) -QT += core-private gui-private +QT += widgets +QT += core-private gui-private widgets-private TEMPLATE = app TARGET = tst_qtracebench diff --git a/tests/benchmarks/gui/styles/qstylesheetstyle/main.cpp b/tests/benchmarks/gui/styles/qstylesheetstyle/main.cpp index 759e930204..bb58834d62 100644 --- a/tests/benchmarks/gui/styles/qstylesheetstyle/main.cpp +++ b/tests/benchmarks/gui/styles/qstylesheetstyle/main.cpp @@ -40,7 +40,16 @@ ****************************************************************************/ // This file contains benchmarks for QRect/QRectF functions. -#include <QtGui> +#include <QtWidgets/QWidget> +#include <QtWidgets/QGridLayout> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QComboBox> +#include <QtWidgets/QSpinBox> +#include <QtWidgets/QCheckBox> +#include <QtWidgets/QRadioButton> +#include <QtWidgets/QLabel> +#include <QtWidgets/QProgressBar> +#include <QtWidgets/QLineEdit> #include <qtest.h> class tst_qstylesheetstyle : public QObject diff --git a/tests/benchmarks/gui/text/qtext/qtext.pro b/tests/benchmarks/gui/text/qtext/qtext.pro index 27465b0897..4e2530b4a8 100644 --- a/tests/benchmarks/gui/text/qtext/qtext.pro +++ b/tests/benchmarks/gui/text/qtext/qtext.pro @@ -1,6 +1,7 @@ load(qttest_p4) -QT += gui-private +QT += widgets +QT += gui-private widgets-private TEMPLATE = app TARGET = tst_bench_QText |