diff options
| author | David Skoland <[email protected]> | 2020-11-26 17:31:50 +0100 |
|---|---|---|
| committer | Volker Hilsheimer <[email protected]> | 2020-12-22 15:20:30 +0100 |
| commit | 27d96b4789b98587e64642bf7bd6ef5f3a07e174 (patch) | |
| tree | 24db364d54a9b64a959b14bc5cc2bd3c64d5ccc7 /src | |
| 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 <[email protected]>
Diffstat (limited to 'src')
9 files changed, 11 insertions, 9 deletions
diff --git a/src/3rdparty/tinycbor/tests/encoder/data.cpp b/src/3rdparty/tinycbor/tests/encoder/data.cpp index 8b00cfec1f6..995c54674d2 100644 --- a/src/3rdparty/tinycbor/tests/encoder/data.cpp +++ b/src/3rdparty/tinycbor/tests/encoder/data.cpp @@ -22,7 +22,8 @@ ** ****************************************************************************/ -#include <QtTest> +#include <QTest> +#include <QFloat16> static float myNaNf() { diff --git a/src/3rdparty/tinycbor/tests/encoder/tst_encoder.cpp b/src/3rdparty/tinycbor/tests/encoder/tst_encoder.cpp index 458f55eb109..8eede1123f1 100644 --- a/src/3rdparty/tinycbor/tests/encoder/tst_encoder.cpp +++ b/src/3rdparty/tinycbor/tests/encoder/tst_encoder.cpp @@ -22,7 +22,7 @@ ** ****************************************************************************/ -#include <QtTest> +#include <QTest> #include "cbor.h" #if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0) diff --git a/src/3rdparty/tinycbor/tests/parser/data.cpp b/src/3rdparty/tinycbor/tests/parser/data.cpp index 3523c32167b..f440bae7a05 100644 --- a/src/3rdparty/tinycbor/tests/parser/data.cpp +++ b/src/3rdparty/tinycbor/tests/parser/data.cpp @@ -1,4 +1,4 @@ -#include <QtTest> +#include <QTest> #include <limits> #include <cbor.h> diff --git a/src/3rdparty/tinycbor/tests/parser/tst_parser.cpp b/src/3rdparty/tinycbor/tests/parser/tst_parser.cpp index 2b10004faad..d3ae4faa8ef 100644 --- a/src/3rdparty/tinycbor/tests/parser/tst_parser.cpp +++ b/src/3rdparty/tinycbor/tests/parser/tst_parser.cpp @@ -24,7 +24,7 @@ #define _XOPEN_SOURCE 700 #define _DARWIN_C_SOURCE 1 /* need MAP_ANON */ -#include <QtTest> +#include <QTest> #include "cbor.h" #include <stdio.h> #include <stdarg.h> diff --git a/src/testlib/doc/snippets/code/doc_src_qtestevent.cpp b/src/testlib/doc/snippets/code/doc_src_qtestevent.cpp index 8d125f60b7b..1d91ebd6443 100644 --- a/src/testlib/doc/snippets/code/doc_src_qtestevent.cpp +++ b/src/testlib/doc/snippets/code/doc_src_qtestevent.cpp @@ -48,7 +48,7 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <QLineEdit> // dummy diff --git a/src/testlib/doc/snippets/code/doc_src_qtestlib.cpp b/src/testlib/doc/snippets/code/doc_src_qtestlib.cpp index 8938a159115..26798e63d55 100644 --- a/src/testlib/doc/snippets/code/doc_src_qtestlib.cpp +++ b/src/testlib/doc/snippets/code/doc_src_qtestlib.cpp @@ -48,7 +48,7 @@ ** ****************************************************************************/ -#include <QtTest> +#include <QTest> #include "src_qtestlib_qtestcase.cpp" //! [0] class MyFirstTest: public QObject diff --git a/src/testlib/doc/snippets/code/doc_src_qttest.cpp b/src/testlib/doc/snippets/code/doc_src_qttest.cpp index af28811a586..7f7e04988f0 100644 --- a/src/testlib/doc/snippets/code/doc_src_qttest.cpp +++ b/src/testlib/doc/snippets/code/doc_src_qttest.cpp @@ -49,5 +49,5 @@ ****************************************************************************/ //! [0] -#include <QtTest> +#include <QTest> //! [0] diff --git a/src/testlib/doc/snippets/code/src_corelib_kernel_qtestsupport_core.cpp b/src/testlib/doc/snippets/code/src_corelib_kernel_qtestsupport_core.cpp index 33b0e19be0a..93337dc3003 100644 --- a/src/testlib/doc/snippets/code/src_corelib_kernel_qtestsupport_core.cpp +++ b/src/testlib/doc/snippets/code/src_corelib_kernel_qtestsupport_core.cpp @@ -47,7 +47,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <QtTest> +#include <QTest> // dummy class class MyObject diff --git a/src/testlib/qabstractitemmodeltester.cpp b/src/testlib/qabstractitemmodeltester.cpp index dd643c89459..42bac5afb2a 100644 --- a/src/testlib/qabstractitemmodeltester.cpp +++ b/src/testlib/qabstractitemmodeltester.cpp @@ -44,7 +44,8 @@ #include <QtCore/QPointer> #include <QtCore/QAbstractItemModel> #include <QtCore/QStack> -#include <QtTest/QtTest> +#include <QTest> +#include <QLoggingCategory> QT_BEGIN_NAMESPACE |