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/auto/corelib/global | |
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/auto/corelib/global')
12 files changed, 13 insertions, 12 deletions
diff --git a/tests/auto/corelib/global/q_func_info/tst_q_func_info.cpp b/tests/auto/corelib/global/q_func_info/tst_q_func_info.cpp index 32e4217ad0..9d6bc15d73 100644 --- a/tests/auto/corelib/global/q_func_info/tst_q_func_info.cpp +++ b/tests/auto/corelib/global/q_func_info/tst_q_func_info.cpp @@ -28,7 +28,7 @@ #include <QString> -#include <QtTest/QtTest> +#include <QTest> #include <QtDebug> class tst_q_func_info : public QObject diff --git a/tests/auto/corelib/global/qflags/tst_qflags.cpp b/tests/auto/corelib/global/qflags/tst_qflags.cpp index 86a233f984..4b76a32c9a 100644 --- a/tests/auto/corelib/global/qflags/tst_qflags.cpp +++ b/tests/auto/corelib/global/qflags/tst_qflags.cpp @@ -25,7 +25,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> QT_WARNING_DISABLE_DEPRECATED diff --git a/tests/auto/corelib/global/qfloat16/tst_qfloat16.cpp b/tests/auto/corelib/global/qfloat16/tst_qfloat16.cpp index 82ad6b1c38..96051cbe2c 100644 --- a/tests/auto/corelib/global/qfloat16/tst_qfloat16.cpp +++ b/tests/auto/corelib/global/qfloat16/tst_qfloat16.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <QFloat16> #include <math.h> diff --git a/tests/auto/corelib/global/qgetputenv/tst_qgetputenv.cpp b/tests/auto/corelib/global/qgetputenv/tst_qgetputenv.cpp index 8cc66c6477..519c5fa88d 100644 --- a/tests/auto/corelib/global/qgetputenv/tst_qgetputenv.cpp +++ b/tests/auto/corelib/global/qgetputenv/tst_qgetputenv.cpp @@ -28,7 +28,7 @@ ****************************************************************************/ #include <qdebug.h> -#include <QtTest/QtTest> +#include <QTest> #include <qglobal.h> #ifdef Q_OS_WIN diff --git a/tests/auto/corelib/global/qglobal/tst_qglobal.cpp b/tests/auto/corelib/global/qglobal/tst_qglobal.cpp index 1f64fca3dc..5b10049144 100644 --- a/tests/auto/corelib/global/qglobal/tst_qglobal.cpp +++ b/tests/auto/corelib/global/qglobal/tst_qglobal.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <QPair> #include <QSysInfo> diff --git a/tests/auto/corelib/global/qglobalstatic/tst_qglobalstatic.cpp b/tests/auto/corelib/global/qglobalstatic/tst_qglobalstatic.cpp index 53a521d06d..dfc62ce163 100644 --- a/tests/auto/corelib/global/qglobalstatic/tst_qglobalstatic.cpp +++ b/tests/auto/corelib/global/qglobalstatic/tst_qglobalstatic.cpp @@ -28,7 +28,8 @@ ****************************************************************************/ #include <QtCore/QThread> -#include <QtTest/QtTest> +#include <QTest> +#include <QReadWriteLock> #if defined(Q_OS_UNIX) #include <sys/resource.h> diff --git a/tests/auto/corelib/global/qhooks/tst_qhooks.cpp b/tests/auto/corelib/global/qhooks/tst_qhooks.cpp index c06b9e7e3d..5a24275177 100644 --- a/tests/auto/corelib/global/qhooks/tst_qhooks.cpp +++ b/tests/auto/corelib/global/qhooks/tst_qhooks.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <QtCore/private/qhooks_p.h> class tst_QHooks: public QObject diff --git a/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp b/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp index 526fbbabb2..0cfb8541ab 100644 --- a/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp +++ b/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp @@ -28,7 +28,7 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <QtGlobal> #include "private/qnumeric_p.h" diff --git a/tests/auto/corelib/global/qoperatingsystemversion/tst_qoperatingsystemversion.cpp b/tests/auto/corelib/global/qoperatingsystemversion/tst_qoperatingsystemversion.cpp index 5fae598fc6..b109666be5 100644 --- a/tests/auto/corelib/global/qoperatingsystemversion/tst_qoperatingsystemversion.cpp +++ b/tests/auto/corelib/global/qoperatingsystemversion/tst_qoperatingsystemversion.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <qoperatingsystemversion.h> class tst_QOperatingSystemVersion : public QObject diff --git a/tests/auto/corelib/global/qrandomgenerator/tst_qrandomgenerator.cpp b/tests/auto/corelib/global/qrandomgenerator/tst_qrandomgenerator.cpp index 9f4abb367a..847193e3b5 100644 --- a/tests/auto/corelib/global/qrandomgenerator/tst_qrandomgenerator.cpp +++ b/tests/auto/corelib/global/qrandomgenerator/tst_qrandomgenerator.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include <QtTest> +#include <QTest> #include <qlist.h> #include <qobject.h> #include <qrandom.h> diff --git a/tests/auto/corelib/global/qtendian/tst_qtendian.cpp b/tests/auto/corelib/global/qtendian/tst_qtendian.cpp index 2345bb39c1..58fcca4351 100644 --- a/tests/auto/corelib/global/qtendian/tst_qtendian.cpp +++ b/tests/auto/corelib/global/qtendian/tst_qtendian.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <QtCore/qendian.h> #include <QtCore/private/qendian_p.h> diff --git a/tests/auto/corelib/global/qwinregistry/tst_qwinregistry.cpp b/tests/auto/corelib/global/qwinregistry/tst_qwinregistry.cpp index ac811de2a1..c73a0a7575 100644 --- a/tests/auto/corelib/global/qwinregistry/tst_qwinregistry.cpp +++ b/tests/auto/corelib/global/qwinregistry/tst_qwinregistry.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <QtCore/qoperatingsystemversion.h> |