diff options
author | David Skoland <david.skoland@qt.io> | 2020-11-26 17:31:50 +0100 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-12-22 15:20:30 +0100 |
commit | 27d96b4789b98587e64642bf7bd6ef5f3a07e174 (patch) | |
tree | 24db364d54a9b64a959b14bc5cc2bd3c64d5ccc7 /tests/manual | |
parent | bbebfa0be2e51b638459d6d812e4db25a65a0d6d (diff) |
Replace QtTest headers with QTest
Complete search and replace of QtTest and QtTest/QtTest with QTest, as
QtTest includes the whole module. Replace all such instances with
correct header includes. See Jira task for more discussion.
Fixes: QTBUG-88831
Change-Id: I981cfae18a1cabcabcabee376016b086d9d01f44
Pick-to: 6.0
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'tests/manual')
-rw-r--r-- | tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp | 2 | ||||
-rw-r--r-- | tests/manual/network_stresstest/tst_network_stresstest.cpp | 2 | ||||
-rw-r--r-- | tests/manual/qdesktopservices/tst_qdesktopservices.cpp | 2 | ||||
-rw-r--r-- | tests/manual/qhttpnetworkconnection/main.cpp | 2 | ||||
-rw-r--r-- | tests/manual/qnetworkreply/main.cpp | 2 | ||||
-rw-r--r-- | tests/manual/qsslsocket/main.cpp | 2 | ||||
-rw-r--r-- | tests/manual/qt_poll/tst_qt_poll.cpp | 2 | ||||
-rw-r--r-- | tests/manual/qtouchevent/main.cpp | 2 | ||||
-rw-r--r-- | tests/manual/socketengine/main.cpp | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp b/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp index c7fd8b0cf3..b2545285c4 100644 --- a/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp +++ b/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <QtCore/QElapsedTimer> #include <QtCore/QList> #include <QtCore/QSemaphore> diff --git a/tests/manual/network_stresstest/tst_network_stresstest.cpp b/tests/manual/network_stresstest/tst_network_stresstest.cpp index 330a52c3e3..b86b3b884d 100644 --- a/tests/manual/network_stresstest/tst_network_stresstest.cpp +++ b/tests/manual/network_stresstest/tst_network_stresstest.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <QtCore/QElapsedTimer> #include <QtCore/QList> #include <QtCore/QSemaphore> diff --git a/tests/manual/qdesktopservices/tst_qdesktopservices.cpp b/tests/manual/qdesktopservices/tst_qdesktopservices.cpp index f17491ec7d..e17ca413eb 100644 --- a/tests/manual/qdesktopservices/tst_qdesktopservices.cpp +++ b/tests/manual/qdesktopservices/tst_qdesktopservices.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ #include <QString> -#include <QtTest> +#include <QTest> #include <QCoreApplication> #include <QDesktopServices> diff --git a/tests/manual/qhttpnetworkconnection/main.cpp b/tests/manual/qhttpnetworkconnection/main.cpp index a588e08e9b..c4c87598c7 100644 --- a/tests/manual/qhttpnetworkconnection/main.cpp +++ b/tests/manual/qhttpnetworkconnection/main.cpp @@ -29,7 +29,7 @@ #include <QDebug> #include <qtest.h> -#include <QtTest/QtTest> +#include <QTest> #include <QtNetwork/qnetworkreply.h> #include <QtNetwork/qnetworkrequest.h> #include <QtNetwork/qnetworkaccessmanager.h> diff --git a/tests/manual/qnetworkreply/main.cpp b/tests/manual/qnetworkreply/main.cpp index 4ecb4bc728..8b013bd2ce 100644 --- a/tests/manual/qnetworkreply/main.cpp +++ b/tests/manual/qnetworkreply/main.cpp @@ -30,7 +30,7 @@ #include <QDebug> #include <qtest.h> -#include <QtTest/QtTest> +#include <QTest> #include <QtNetwork/qnetworkreply.h> #include <QtNetwork/qnetworkrequest.h> #include <QtNetwork/qnetworkaccessmanager.h> diff --git a/tests/manual/qsslsocket/main.cpp b/tests/manual/qsslsocket/main.cpp index 58da520c07..188a1f4027 100644 --- a/tests/manual/qsslsocket/main.cpp +++ b/tests/manual/qsslsocket/main.cpp @@ -29,7 +29,7 @@ #include <QtNetwork/qsslconfiguration.h> #include <QtNetwork/qsslsocket.h> -#include <QtTest/QtTest> +#include <QTest> #ifndef QT_NO_SSL Q_DECLARE_METATYPE(QSslConfiguration::NextProtocolNegotiationStatus) diff --git a/tests/manual/qt_poll/tst_qt_poll.cpp b/tests/manual/qt_poll/tst_qt_poll.cpp index 557323478e..1fb5c2ca89 100644 --- a/tests/manual/qt_poll/tst_qt_poll.cpp +++ b/tests/manual/qt_poll/tst_qt_poll.cpp @@ -30,7 +30,7 @@ #define QT_NO_NATIVE_POLL #endif -#include <QtTest/QtTest> +#include <QTest> #include <QtNetwork> #include <private/qcore_unix_p.h> diff --git a/tests/manual/qtouchevent/main.cpp b/tests/manual/qtouchevent/main.cpp index b71fe503aa..a5162d6f12 100644 --- a/tests/manual/qtouchevent/main.cpp +++ b/tests/manual/qtouchevent/main.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ #include <QApplication> -#include <QtTest> +#include <QTest> #include "ui_form.h" #include "touchwidget.h" diff --git a/tests/manual/socketengine/main.cpp b/tests/manual/socketengine/main.cpp index 46d62b9a9c..1ae5a42e65 100644 --- a/tests/manual/socketengine/main.cpp +++ b/tests/manual/socketengine/main.cpp @@ -28,7 +28,7 @@ #include <QDebug> #include <qtest.h> -#include <QtTest/QtTest> +#include <QTest> #include <QtNetwork/qnetworkreply.h> #include <QtNetwork/qnetworkrequest.h> #include <QtNetwork/qnetworkaccessmanager.h> |