summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/3rdparty/tinycbor/tests/encoder/data.cpp3
-rw-r--r--src/3rdparty/tinycbor/tests/encoder/tst_encoder.cpp2
-rw-r--r--src/3rdparty/tinycbor/tests/parser/data.cpp2
-rw-r--r--src/3rdparty/tinycbor/tests/parser/tst_parser.cpp2
-rw-r--r--src/testlib/doc/snippets/code/doc_src_qtestevent.cpp2
-rw-r--r--src/testlib/doc/snippets/code/doc_src_qtestlib.cpp2
-rw-r--r--src/testlib/doc/snippets/code/doc_src_qttest.cpp2
-rw-r--r--src/testlib/doc/snippets/code/src_corelib_kernel_qtestsupport_core.cpp2
-rw-r--r--src/testlib/qabstractitemmodeltester.cpp3
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 8b00cfec1f..995c54674d 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 458f55eb10..8eede1123f 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 3523c32167..f440bae7a0 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 2b10004faa..d3ae4faa8e 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 8d125f60b7..1d91ebd644 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 8938a15911..26798e63d5 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 af28811a58..7f7e04988f 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 33b0e19be0..93337dc300 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 dd643c8945..42bac5afb2 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