summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui/util
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/gui/util')
-rw-r--r--tests/auto/gui/util/qdesktopservices/tst_qdesktopservices.cpp2
-rw-r--r--tests/auto/gui/util/qdoublevalidator/tst_qdoublevalidator.cpp4
-rw-r--r--tests/auto/gui/util/qintvalidator/tst_qintvalidator.cpp4
-rw-r--r--tests/auto/gui/util/qregularexpressionvalidator/tst_qregularexpressionvalidator.cpp3
-rw-r--r--tests/auto/gui/util/qshadergenerator/tst_qshadergenerator.cpp2
-rw-r--r--tests/auto/gui/util/qshadergraph/tst_qshadergraph.cpp2
-rw-r--r--tests/auto/gui/util/qshadergraphloader/tst_qshadergraphloader.cpp2
-rw-r--r--tests/auto/gui/util/qshadernodes/tst_qshadernodes.cpp2
-rw-r--r--tests/auto/gui/util/qshadernodesloader/tst_qshadernodesloader.cpp2
-rw-r--r--tests/auto/gui/util/qtexturefilereader/tst_qtexturefilereader.cpp2
-rw-r--r--tests/auto/gui/util/qundogroup/tst_qundogroup.cpp6
-rw-r--r--tests/auto/gui/util/qundostack/tst_qundostack.cpp6
12 files changed, 24 insertions, 13 deletions
diff --git a/tests/auto/gui/util/qdesktopservices/tst_qdesktopservices.cpp b/tests/auto/gui/util/qdesktopservices/tst_qdesktopservices.cpp
index ba4a035767..7446f8ed9f 100644
--- a/tests/auto/gui/util/qdesktopservices/tst_qdesktopservices.cpp
+++ b/tests/auto/gui/util/qdesktopservices/tst_qdesktopservices.cpp
@@ -27,7 +27,7 @@
****************************************************************************/
-#include <QtTest/QtTest>
+#include <QTest>
#include <qdesktopservices.h>
#include <qregularexpression.h>
diff --git a/tests/auto/gui/util/qdoublevalidator/tst_qdoublevalidator.cpp b/tests/auto/gui/util/qdoublevalidator/tst_qdoublevalidator.cpp
index 366f3b6fdf..fb8e5f0a3a 100644
--- a/tests/auto/gui/util/qdoublevalidator/tst_qdoublevalidator.cpp
+++ b/tests/auto/gui/util/qdoublevalidator/tst_qdoublevalidator.cpp
@@ -27,8 +27,8 @@
****************************************************************************/
-#include <QtTest/QtTest>
-
+#include <QTest>
+#include <QSignalSpy>
#include <qvalidator.h>
diff --git a/tests/auto/gui/util/qintvalidator/tst_qintvalidator.cpp b/tests/auto/gui/util/qintvalidator/tst_qintvalidator.cpp
index ec0d63f67c..5dc7cba2c2 100644
--- a/tests/auto/gui/util/qintvalidator/tst_qintvalidator.cpp
+++ b/tests/auto/gui/util/qintvalidator/tst_qintvalidator.cpp
@@ -27,7 +27,9 @@
****************************************************************************/
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QSignalSpy>
+
#include <qvalidator.h>
class tst_QIntValidator : public QObject
diff --git a/tests/auto/gui/util/qregularexpressionvalidator/tst_qregularexpressionvalidator.cpp b/tests/auto/gui/util/qregularexpressionvalidator/tst_qregularexpressionvalidator.cpp
index 63aa6bd558..0d1d748e00 100644
--- a/tests/auto/gui/util/qregularexpressionvalidator/tst_qregularexpressionvalidator.cpp
+++ b/tests/auto/gui/util/qregularexpressionvalidator/tst_qregularexpressionvalidator.cpp
@@ -28,7 +28,8 @@
****************************************************************************/
#include <QtGui/QRegularExpressionValidator>
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QSignalSpy>
class tst_QRegularExpressionValidator : public QObject
{
diff --git a/tests/auto/gui/util/qshadergenerator/tst_qshadergenerator.cpp b/tests/auto/gui/util/qshadergenerator/tst_qshadergenerator.cpp
index 58bea1b6b7..408460132b 100644
--- a/tests/auto/gui/util/qshadergenerator/tst_qshadergenerator.cpp
+++ b/tests/auto/gui/util/qshadergenerator/tst_qshadergenerator.cpp
@@ -27,7 +27,7 @@
****************************************************************************/
-#include <QtTest/QtTest>
+#include <QTest>
#include <QtCore/qmetaobject.h>
#include <QtGui/private/qshadergenerator_p.h>
diff --git a/tests/auto/gui/util/qshadergraph/tst_qshadergraph.cpp b/tests/auto/gui/util/qshadergraph/tst_qshadergraph.cpp
index 3a8d5700b4..8cf62eb387 100644
--- a/tests/auto/gui/util/qshadergraph/tst_qshadergraph.cpp
+++ b/tests/auto/gui/util/qshadergraph/tst_qshadergraph.cpp
@@ -27,7 +27,7 @@
****************************************************************************/
-#include <QtTest/QtTest>
+#include <QTest>
#include <QtGui/private/qshadergraph_p.h>
diff --git a/tests/auto/gui/util/qshadergraphloader/tst_qshadergraphloader.cpp b/tests/auto/gui/util/qshadergraphloader/tst_qshadergraphloader.cpp
index 53ddc1874f..86db9edbea 100644
--- a/tests/auto/gui/util/qshadergraphloader/tst_qshadergraphloader.cpp
+++ b/tests/auto/gui/util/qshadergraphloader/tst_qshadergraphloader.cpp
@@ -27,7 +27,7 @@
****************************************************************************/
-#include <QtTest/QtTest>
+#include <QTest>
#include <QtCore/qbuffer.h>
diff --git a/tests/auto/gui/util/qshadernodes/tst_qshadernodes.cpp b/tests/auto/gui/util/qshadernodes/tst_qshadernodes.cpp
index 9eb738a1b2..be6239a4fd 100644
--- a/tests/auto/gui/util/qshadernodes/tst_qshadernodes.cpp
+++ b/tests/auto/gui/util/qshadernodes/tst_qshadernodes.cpp
@@ -27,7 +27,7 @@
****************************************************************************/
-#include <QtTest/QtTest>
+#include <QTest>
#include <QtGui/private/qshaderformat_p.h>
#include <QtGui/private/qshadernode_p.h>
diff --git a/tests/auto/gui/util/qshadernodesloader/tst_qshadernodesloader.cpp b/tests/auto/gui/util/qshadernodesloader/tst_qshadernodesloader.cpp
index af9e7b8c8e..fd022ba83f 100644
--- a/tests/auto/gui/util/qshadernodesloader/tst_qshadernodesloader.cpp
+++ b/tests/auto/gui/util/qshadernodesloader/tst_qshadernodesloader.cpp
@@ -27,7 +27,7 @@
****************************************************************************/
-#include <QtTest/QtTest>
+#include <QTest>
#include <QtCore/qbuffer.h>
diff --git a/tests/auto/gui/util/qtexturefilereader/tst_qtexturefilereader.cpp b/tests/auto/gui/util/qtexturefilereader/tst_qtexturefilereader.cpp
index 9b78d18954..6ff3497a74 100644
--- a/tests/auto/gui/util/qtexturefilereader/tst_qtexturefilereader.cpp
+++ b/tests/auto/gui/util/qtexturefilereader/tst_qtexturefilereader.cpp
@@ -27,7 +27,7 @@
****************************************************************************/
#include <private/qtexturefilereader_p.h>
-#include <QtTest>
+#include <QTest>
class tst_qtexturefilereader : public QObject
{
diff --git a/tests/auto/gui/util/qundogroup/tst_qundogroup.cpp b/tests/auto/gui/util/qundogroup/tst_qundogroup.cpp
index 514890d50b..7c45a60c72 100644
--- a/tests/auto/gui/util/qundogroup/tst_qundogroup.cpp
+++ b/tests/auto/gui/util/qundogroup/tst_qundogroup.cpp
@@ -25,10 +25,14 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-#include <QtTest/QtTest>
+#include <QTest>
#include <QUndoGroup>
#include <QUndoStack>
#include <QAction>
+#include <QSignalSpy>
+#include <QProcess>
+#include <QLibraryInfo>
+#include <QTranslator>
/******************************************************************************
** Commands
diff --git a/tests/auto/gui/util/qundostack/tst_qundostack.cpp b/tests/auto/gui/util/qundostack/tst_qundostack.cpp
index aa3f3c6aa4..662dbe3f36 100644
--- a/tests/auto/gui/util/qundostack/tst_qundostack.cpp
+++ b/tests/auto/gui/util/qundostack/tst_qundostack.cpp
@@ -27,9 +27,13 @@
****************************************************************************/
-#include <QtTest/QtTest>
+#include <QTest>
#include <QAction>
#include <QUndoStack>
+#include <QSignalSpy>
+#include <QProcess>
+#include <QTranslator>
+#include <QLibraryInfo>
/******************************************************************************
** Commands