diff options
Diffstat (limited to 'tests/auto/widgets/kernel')
16 files changed, 30 insertions, 16 deletions
diff --git a/tests/auto/widgets/kernel/qaction/tst_qaction.cpp b/tests/auto/widgets/kernel/qaction/tst_qaction.cpp index b4c259a1ef..63d49e1216 100644 --- a/tests/auto/widgets/kernel/qaction/tst_qaction.cpp +++ b/tests/auto/widgets/kernel/qaction/tst_qaction.cpp @@ -28,7 +28,8 @@ #include <QDialog> #include <QMainWindow> -#include <QtTest/QtTest> +#include <QTest> +#include <QSignalSpy> #include <qapplication.h> #include <qevent.h> diff --git a/tests/auto/widgets/kernel/qactiongroup/tst_qactiongroup.cpp b/tests/auto/widgets/kernel/qactiongroup/tst_qactiongroup.cpp index 539ff9c67f..7462fd8bbf 100644 --- a/tests/auto/widgets/kernel/qactiongroup/tst_qactiongroup.cpp +++ b/tests/auto/widgets/kernel/qactiongroup/tst_qactiongroup.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <qmainwindow.h> #include <qmenu.h> diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp index 6763d3b6a6..46ccc0c662 100644 --- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp +++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp @@ -31,7 +31,12 @@ #include <qdebug.h> -#include <QtTest/QtTest> +#include <QTest> +#include <QTimer> +#include <QLibraryInfo> +#include <QSignalSpy> +#include <QFileSystemWatcher> +#include <QSharedMemory> #include <QtCore/QAbstractEventDispatcher> #include <QtCore/QFileInfo> diff --git a/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp b/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp index c63a3c6a52..a410a7bf00 100644 --- a/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp +++ b/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <QtGui> #include <QtWidgets> diff --git a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp index d718a6c7d7..4aa9f8ac2d 100644 --- a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp +++ b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <qlayout.h> #include <qapplication.h> #include <qwidget.h> diff --git a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp index 411ca7120e..e3bd1d1553 100644 --- a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp +++ b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <qlayout.h> #include <qapplication.h> #include <qwidget.h> diff --git a/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp b/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp index dec332196b..2a497df084 100644 --- a/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp +++ b/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <qcoreapplication.h> #include <qdebug.h> diff --git a/tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp b/tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp index 3abec08f09..6832f7a05a 100644 --- a/tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp +++ b/tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp @@ -27,7 +27,11 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> +#include <QStringList> +#include <QStringListModel> +#include <QSignalSpy> + #include <qapplication.h> #include <qtextedit.h> #include <qlineedit.h> diff --git a/tests/auto/widgets/kernel/qsizepolicy/tst_qsizepolicy.cpp b/tests/auto/widgets/kernel/qsizepolicy/tst_qsizepolicy.cpp index d307d9f9a8..d6a5ec218d 100644 --- a/tests/auto/widgets/kernel/qsizepolicy/tst_qsizepolicy.cpp +++ b/tests/auto/widgets/kernel/qsizepolicy/tst_qsizepolicy.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <qsizepolicy.h> Q_DECLARE_METATYPE(Qt::Orientations) diff --git a/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp b/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp index 8721a7191a..711ffeda03 100644 --- a/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp +++ b/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp @@ -27,13 +27,14 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <QLineEdit> #include <QLabel> #include <QStackedLayout> #include <qapplication.h> #include <qwidget.h> #include <QPushButton> +#include <QSignalSpy> class tst_QStackedLayout : public QObject { diff --git a/tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp b/tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp index 1b492d9a0f..092adc58af 100644 --- a/tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp +++ b/tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp @@ -27,7 +27,9 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> +#include <QTimer> + #include <qfont.h> #include <qfontmetrics.h> #include <qtooltip.h> diff --git a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp index 1b4584f95b..654d8e58ba 100644 --- a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp +++ b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <QtGui/QtGui> #include <QtCore/QTextStream> #include <QtCore/QStringList> diff --git a/tests/auto/widgets/kernel/qwidgetaction/tst_qwidgetaction.cpp b/tests/auto/widgets/kernel/qwidgetaction/tst_qwidgetaction.cpp index ad91cf3031..384c07258b 100644 --- a/tests/auto/widgets/kernel/qwidgetaction/tst_qwidgetaction.cpp +++ b/tests/auto/widgets/kernel/qwidgetaction/tst_qwidgetaction.cpp @@ -27,7 +27,8 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> +#include <QTimer> #include <qapplication.h> #include <qtoolbar.h> diff --git a/tests/auto/widgets/kernel/qwidgetmetatype/tst_qwidgetmetatype.cpp b/tests/auto/widgets/kernel/qwidgetmetatype/tst_qwidgetmetatype.cpp index 1a6eb435a7..425380a99e 100644 --- a/tests/auto/widgets/kernel/qwidgetmetatype/tst_qwidgetmetatype.cpp +++ b/tests/auto/widgets/kernel/qwidgetmetatype/tst_qwidgetmetatype.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <qwidget.h> #include <qlabel.h> diff --git a/tests/auto/widgets/kernel/qwidgetsvariant/tst_qwidgetsvariant.cpp b/tests/auto/widgets/kernel/qwidgetsvariant/tst_qwidgetsvariant.cpp index 364d7fc8c7..d33f734af0 100644 --- a/tests/auto/widgets/kernel/qwidgetsvariant/tst_qwidgetsvariant.cpp +++ b/tests/auto/widgets/kernel/qwidgetsvariant/tst_qwidgetsvariant.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <qvariant.h> diff --git a/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp b/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp index ec646ccbe3..9dead3d3ea 100644 --- a/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp +++ b/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <qapplication.h> #include <qwindow.h> |