1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace QtTest headers with QTest

Browse Source 
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>
This commit is contained in:
David Skoland 2020-11-26 17:31:50 +01:00 committed by Volker Hilsheimer
parent bbebfa0be2
commit 27d96b4789
636 changed files with 1102 additions and 704 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/qtestlib/tutorial1/testqstring.cpp
View File

@ -49,7 +49,7 @@
****************************************************************************/ ****************************************************************************/
//! [0] //! [0]
#include <QtTest/QtTest> #include <QTest>
class TestQString: public QObject class TestQString: public QObject
{ {

2
examples/qtestlib/tutorial2/testqstring.cpp
View File

@ -48,7 +48,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
//! [0] //! [0]
class TestQString: public QObject class TestQString: public QObject

2
examples/qtestlib/tutorial3/testgui.cpp
View File

@ -50,7 +50,7 @@
//! [0] //! [0]
#include <QtWidgets> #include <QtWidgets>
#include <QtTest/QtTest> #include <QTest>
class TestGui: public QObject class TestGui: public QObject
{ {

2
examples/qtestlib/tutorial4/testgui.cpp
View File

@ -49,7 +49,7 @@
****************************************************************************/ ****************************************************************************/
#include <QtWidgets> #include <QtWidgets>
#include <QtTest/QtTest> #include <QTest>
//! [0] //! [0]
class TestGui: public QObject class TestGui: public QObject

3
src/3rdparty/tinycbor/tests/encoder/data.cpp vendored
View File

@ -22,7 +22,8 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest> #include <QTest>
#include <QFloat16>
static float myNaNf() static float myNaNf()
{ {

2
src/3rdparty/tinycbor/tests/encoder/tst_encoder.cpp vendored
View File

@ -22,7 +22,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest> #include <QTest>
#include "cbor.h" #include "cbor.h"
#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)

2
src/3rdparty/tinycbor/tests/parser/data.cpp vendored
View File

@ -1,4 +1,4 @@
#include <QtTest> #include <QTest>
#include <limits> #include <limits>
#include <cbor.h> #include <cbor.h>

2
src/3rdparty/tinycbor/tests/parser/tst_parser.cpp vendored
View File

@ -24,7 +24,7 @@
#define _XOPEN_SOURCE 700 #define _XOPEN_SOURCE 700
#define _DARWIN_C_SOURCE 1 /* need MAP_ANON */ #define _DARWIN_C_SOURCE 1 /* need MAP_ANON */
#include <QtTest> #include <QTest>
#include "cbor.h" #include "cbor.h"
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>

2
src/testlib/doc/snippets/code/doc_src_qtestevent.cpp
View File

@ -48,7 +48,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <QLineEdit> #include <QLineEdit>
// dummy // dummy

2
src/testlib/doc/snippets/code/doc_src_qtestlib.cpp
View File

@ -48,7 +48,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest> #include <QTest>
#include "src_qtestlib_qtestcase.cpp" #include "src_qtestlib_qtestcase.cpp"
//! [0] //! [0]
class MyFirstTest: public QObject class MyFirstTest: public QObject

2
src/testlib/doc/snippets/code/doc_src_qttest.cpp
View File

@ -49,5 +49,5 @@
****************************************************************************/ ****************************************************************************/
//! [0] //! [0]
#include <QtTest> #include <QTest>
//! [0] //! [0]

2
src/testlib/doc/snippets/code/src_corelib_kernel_qtestsupport_core.cpp
View File

@ -47,7 +47,7 @@
** $QT_END_LICENSE$ ** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest> #include <QTest>
// dummy class // dummy class
class MyObject class MyObject

3
src/testlib/qabstractitemmodeltester.cpp
View File

@ -44,7 +44,8 @@
#include <QtCore/QPointer> #include <QtCore/QPointer>
#include <QtCore/QAbstractItemModel> #include <QtCore/QAbstractItemModel>
#include <QtCore/QStack> #include <QtCore/QStack>
#include <QtTest/QtTest> #include <QTest>
#include <QLoggingCategory>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

2
tests/auto/cmake/test_testlib_definitions/main.cpp
View File

@ -27,7 +27,7 @@
****************************************************************************/ ****************************************************************************/
#include <QObject> #include <QObject>
#include <QtTest> #include <QTest>
class TestObject : public QObject class TestObject : public QObject
{ {

2
tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp
View File

@ -28,7 +28,7 @@
#include <qtconcurrentfilter.h> #include <qtconcurrentfilter.h>
#include <QCoreApplication> #include <QCoreApplication>
#include <QList> #include <QList>
#include <QtTest/QtTest> #include <QTest>
#include "../testhelper_functions.h" #include "../testhelper_functions.h"

2
tests/auto/concurrent/qtconcurrentfiltermapgenerated/tst_qtconcurrentfiltermapgenerated.cpp
View File

@ -29,7 +29,7 @@
#include <qtconcurrentmap.h> #include <qtconcurrentmap.h>
#include <QCoreApplication> #include <QCoreApplication>
#include <QList> #include <QList>
#include <QtTest/QtTest> #include <QTest>
#include "../testhelper_functions.h" #include "../testhelper_functions.h"
#include "generation_helpers.h" #include "generation_helpers.h"

2
tests/auto/concurrent/qtconcurrentfiltermapgenerated/tst_qtconcurrentfiltermapgenerated.h
View File

@ -27,7 +27,7 @@
****************************************************************************/ ****************************************************************************/
#include <qtconcurrentfilter.h> #include <qtconcurrentfilter.h>
#include <qtconcurrentmap.h> #include <qtconcurrentmap.h>
#include <QtTest/QtTest> #include <QTest>
#include "generation_helpers.h" #include "generation_helpers.h"

2
tests/auto/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp
View File

@ -67,7 +67,7 @@ int distance(TestIterator &a, TestIterator &b)
} }
#include <qtconcurrentiteratekernel.h> #include <qtconcurrentiteratekernel.h>
#include <QtTest/QtTest> #include <QTest>
using namespace QtConcurrent; using namespace QtConcurrent;

6
tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
View File

@ -27,12 +27,12 @@
****************************************************************************/ ****************************************************************************/
#include <qtconcurrentmap.h> #include <qtconcurrentmap.h>
#include <qexception.h> #include <qexception.h>
#include <qdebug.h> #include <qdebug.h>
#include <QThread> #include <QThread>
#include <QMutex> #include <QMutex>
#include <QTest>
#include <QtTest/QtTest> #include <QRandomGenerator>
#include "../testhelper_functions.h" #include "../testhelper_functions.h"

2
tests/auto/concurrent/qtconcurrentmedian/tst_qtconcurrentmedian.cpp
View File

@ -27,7 +27,7 @@
****************************************************************************/ ****************************************************************************/
#include <qtconcurrentmedian.h> #include <qtconcurrentmedian.h>
#include <QtTest/QtTest> #include <QTest>
class tst_QtConcurrentMedian: public QObject class tst_QtConcurrentMedian: public QObject
{ {

4
tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp
View File

@ -31,7 +31,9 @@
#include <QMutexLocker> #include <QMutexLocker>
#include <QString> #include <QString>
#include <QWaitCondition> #include <QWaitCondition>
#include <QtTest/QtTest> #include <QTest>
#include <QTimer>
#include <QFutureSynchronizer>
using namespace QtConcurrent; using namespace QtConcurrent;

5
tests/auto/concurrent/qtconcurrenttask/tst_qtconcurrenttask.cpp
View File

@ -28,7 +28,10 @@
#include <qtconcurrenttask.h> #include <qtconcurrenttask.h>
#include <QtTest/QtTest> #include <QTest>
#include <QSemaphore>
#include <random>
class tst_QtConcurrentTask : public QObject class tst_QtConcurrentTask : public QObject
{ {

2
tests/auto/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp
View File

@ -29,7 +29,7 @@
#include <qexception.h> #include <qexception.h>
#include <QThread> #include <QThread>
#include <QElapsedTimer> #include <QElapsedTimer>
#include <QtTest/QtTest> #include <QTest>
using namespace QtConcurrent; using namespace QtConcurrent;

2
tests/auto/corelib/animation/qabstractanimation/tst_qabstractanimation.cpp
View File

@ -29,7 +29,7 @@
#include <QtCore/qabstractanimation.h> #include <QtCore/qabstractanimation.h>
#include <QtCore/qanimationgroup.h> #include <QtCore/qanimationgroup.h>
#include <QtTest> #include <QTest>
class tst_QAbstractAnimation : public QObject class tst_QAbstractAnimation : public QObject
{ {

6
tests/auto/corelib/animation/qanimationgroup/tst_qanimationgroup.cpp
View File

@ -26,7 +26,11 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <QPauseAnimation>
#include <QVariantAnimation>
#include <QPropertyAnimation>
#include <QSignalSpy>
#include <QtCore/qanimationgroup.h> #include <QtCore/qanimationgroup.h>
#include <QtCore/qsequentialanimationgroup.h> #include <QtCore/qsequentialanimationgroup.h>

5
tests/auto/corelib/animation/qparallelanimationgroup/tst_qparallelanimationgroup.cpp
View File

@ -26,7 +26,10 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <QVariantAnimation>
#include <QPropertyAnimation>
#include <QSignalSpy>
#include <QtCore/qparallelanimationgroup.h> #include <QtCore/qparallelanimationgroup.h>

4
tests/auto/corelib/animation/qpauseanimation/tst_qpauseanimation.cpp
View File

@ -26,12 +26,14 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <QtCore/qpauseanimation.h> #include <QtCore/qpauseanimation.h>
#include <QtCore/qpropertyanimation.h> #include <QtCore/qpropertyanimation.h>
#include <QtCore/qsequentialanimationgroup.h> #include <QtCore/qsequentialanimationgroup.h>
#include <QParallelAnimationGroup>
#include <private/qabstractanimation_p.h> #include <private/qabstractanimation_p.h>
#if defined(Q_OS_WIN) || defined(Q_OS_ANDROID) #if defined(Q_OS_WIN) || defined(Q_OS_ANDROID)

5
tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp
View File

@ -26,7 +26,10 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <QSignalSpy>
#include <QAnimationGroup>
#include <QSequentialAnimationGroup>
#include <QtCore/qpropertyanimation.h> #include <QtCore/qpropertyanimation.h>
#include <QtCore/qvariantanimation.h> #include <QtCore/qvariantanimation.h>
#include <private/qabstractanimation_p.h> #include <private/qabstractanimation_p.h>

7
tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp
View File

@ -26,7 +26,12 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <QVariantAnimation>
#include <QPropertyAnimation>
#include <QSignalSpy>
#include <QParallelAnimationGroup>
#include <QtCore/qanimationgroup.h> #include <QtCore/qanimationgroup.h>
#include <QtCore/qsequentialanimationgroup.h> #include <QtCore/qsequentialanimationgroup.h>

2
tests/auto/corelib/animation/qvariantanimation/tst_qvariantanimation.cpp
View File

@ -28,7 +28,7 @@
#include <QtCore/qvariantanimation.h> #include <QtCore/qvariantanimation.h>
#include <QtTest> #include <QTest>
class tst_QVariantAnimation : public QObject class tst_QVariantAnimation : public QObject
{ {

2
tests/auto/corelib/global/q_func_info/tst_q_func_info.cpp
View File

@ -28,7 +28,7 @@
#include <QString> #include <QString>
#include <QtTest/QtTest> #include <QTest>
#include <QtDebug> #include <QtDebug>
class tst_q_func_info : public QObject class tst_q_func_info : public QObject

2
tests/auto/corelib/global/qflags/tst_qflags.cpp
View File

@ -25,7 +25,7 @@
** $QT_END_LICENSE$ ** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
QT_WARNING_DISABLE_DEPRECATED QT_WARNING_DISABLE_DEPRECATED

2
tests/auto/corelib/global/qfloat16/tst_qfloat16.cpp
View File

@ -27,7 +27,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <QFloat16> #include <QFloat16>
#include <math.h> #include <math.h>

2
tests/auto/corelib/global/qgetputenv/tst_qgetputenv.cpp
View File

@ -28,7 +28,7 @@
****************************************************************************/ ****************************************************************************/
#include <qdebug.h> #include <qdebug.h>
#include <QtTest/QtTest> #include <QTest>
#include <qglobal.h> #include <qglobal.h>
#ifdef Q_OS_WIN #ifdef Q_OS_WIN

2
tests/auto/corelib/global/qglobal/tst_qglobal.cpp
View File

@ -27,7 +27,7 @@
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <QPair> #include <QPair>
#include <QSysInfo> #include <QSysInfo>

3
tests/auto/corelib/global/qglobalstatic/tst_qglobalstatic.cpp
View File

@ -28,7 +28,8 @@
****************************************************************************/ ****************************************************************************/
#include <QtCore/QThread> #include <QtCore/QThread>
#include <QtTest/QtTest> #include <QTest>
#include <QReadWriteLock>
#if defined(Q_OS_UNIX) #if defined(Q_OS_UNIX)
#include <sys/resource.h> #include <sys/resource.h>

2
tests/auto/corelib/global/qhooks/tst_qhooks.cpp
View File

@ -27,7 +27,7 @@
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <QtCore/private/qhooks_p.h> #include <QtCore/private/qhooks_p.h>
class tst_QHooks: public QObject class tst_QHooks: public QObject

2
tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp
View File

@ -28,7 +28,7 @@
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <QtGlobal> #include <QtGlobal>
#include "private/qnumeric_p.h" #include "private/qnumeric_p.h"

2
tests/auto/corelib/global/qoperatingsystemversion/tst_qoperatingsystemversion.cpp
View File

@ -26,7 +26,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <qoperatingsystemversion.h> #include <qoperatingsystemversion.h>
class tst_QOperatingSystemVersion : public QObject class tst_QOperatingSystemVersion : public QObject

2
tests/auto/corelib/global/qrandomgenerator/tst_qrandomgenerator.cpp
View File

@ -26,7 +26,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest> #include <QTest>
#include <qlist.h> #include <qlist.h>
#include <qobject.h> #include <qobject.h>
#include <qrandom.h> #include <qrandom.h>

2
tests/auto/corelib/global/qtendian/tst_qtendian.cpp
View File

@ -27,7 +27,7 @@
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <QtCore/qendian.h> #include <QtCore/qendian.h>
#include <QtCore/private/qendian_p.h> #include <QtCore/private/qendian_p.h>

2
tests/auto/corelib/global/qwinregistry/tst_qwinregistry.cpp
View File

@ -26,7 +26,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <QtCore/qoperatingsystemversion.h> #include <QtCore/qoperatingsystemversion.h>

3
tests/auto/corelib/io/qbuffer/tst_qbuffer.cpp
View File

@ -26,7 +26,8 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <QTestEventLoop>
#include <QBuffer> #include <QBuffer>
#include <QByteArray> #include <QByteArray>

2
tests/auto/corelib/io/qdataurl/tst_qdataurl.cpp
View File

@ -27,7 +27,7 @@
****************************************************************************/ ****************************************************************************/
#include "private/qdataurl_p.h" #include "private/qdataurl_p.h"
#include <QtTest/QtTest> #include <QTest>
#include <QtCore/QDebug> #include <QtCore/QDebug>
class tst_QDataUrl : public QObject class tst_QDataUrl : public QObject

6
tests/auto/corelib/io/qdebug/tst_qdebug.cpp
View File

@ -30,11 +30,15 @@
#include <QtCore/QCoreApplication> #include <QtCore/QCoreApplication>
#include <QtCore/QtDebug> #include <QtCore/QtDebug>
#include <QtTest/QtTest>
#include <QTest>
#include <QtConcurrentRun> #include <QtConcurrentRun>
#include <QFutureSynchronizer> #include <QFutureSynchronizer>
#include <QVariant> #include <QVariant>
#include <QSemaphore>
#include <QLine>
#include <QMimeType>
#include <QMimeDatabase>
static_assert(QTypeTraits::has_ostream_operator_v<QDebug, int>); static_assert(QTypeTraits::has_ostream_operator_v<QDebug, int>);
static_assert(QTypeTraits::has_ostream_operator_v<QDebug, QList<int>>); static_assert(QTypeTraits::has_ostream_operator_v<QDebug, QList<int>>);

4
tests/auto/corelib/io/qdir/tst_qdir.cpp
View File

@ -27,7 +27,9 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <QTemporaryFile>
#include <QProcess>
#include <qcoreapplication.h> #include <qcoreapplication.h>
#include <qdebug.h> #include <qdebug.h>

6
tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp
View File

@ -27,7 +27,7 @@
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <qcoreapplication.h> #include <qcoreapplication.h>
#include <qdebug.h> #include <qdebug.h>
@ -45,6 +45,10 @@
# include "../../../network-settings.h" # include "../../../network-settings.h"
#endif #endif
#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_EMBEDDED)
#include <QStandardPaths>
#endif
Q_DECLARE_METATYPE(QDirIterator::IteratorFlags) Q_DECLARE_METATYPE(QDirIterator::IteratorFlags)
Q_DECLARE_METATYPE(QDir::Filters) Q_DECLARE_METATYPE(QDir::Filters)

7
tests/auto/corelib/io/qfile/tst_qfile.cpp
View File

@ -27,7 +27,8 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <QScopedValueRollback>
#include <qplatformdefs.h> #include <qplatformdefs.h>
#include <QCoreApplication> #include <QCoreApplication>
@ -36,6 +37,10 @@
#include <QFile> #include <QFile>
#include <QFileInfo> #include <QFileInfo>
#include <QTemporaryDir> #include <QTemporaryDir>
#include <QTemporaryFile>
#include <QOperatingSystemVersion>
#include <QStorageInfo>
#include <QScopeGuard>
#include <private/qabstractfileengine_p.h> #include <private/qabstractfileengine_p.h>
#include <private/qfsfileengine_p.h> #include <private/qfsfileengine_p.h>

5
tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
View File

@ -26,7 +26,10 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <QStandardPaths>
#include <QScopeGuard>
#include <QScopedValueRollback>
#include <qfile.h> #include <qfile.h>
#include <qdir.h> #include <qdir.h>

2
tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp
View File

@ -26,7 +26,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <qplatformdefs.h> #include <qplatformdefs.h>
#include <QCoreApplication> #include <QCoreApplication>

2
tests/auto/corelib/io/qfilesystementry/tst_qfilesystementry.cpp
View File

@ -26,7 +26,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <QtCore/private/qfilesystementry_p.h> #include <QtCore/private/qfilesystementry_p.h>

2
tests/auto/corelib/io/qfilesystemmetadata/tst_qfilesystemmetadata.cpp
View File

@ -26,7 +26,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <QtCore/private/qfilesystemmetadata_p.h> #include <QtCore/private/qfilesystemmetadata_p.h>
class tst_QFileSystemMetaData : public QObject class tst_QFileSystemMetaData : public QObject

9
tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
View File

@ -25,7 +25,7 @@
** $QT_END_LICENSE$ ** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <QCoreApplication> #include <QCoreApplication>
@ -34,10 +34,17 @@
#include <QElapsedTimer> #include <QElapsedTimer>
#include <QTextStream> #include <QTextStream>
#include <QDir> #include <QDir>
#include <QSignalSpy>
#include <QTimer>
#include <QTemporaryFile>
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
#include <windows.h> #include <windows.h>
#endif #endif
#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_EMBEDDED)
#include <QStandardPaths>
#endif
/* All tests need to run in temporary directories not used /* All tests need to run in temporary directories not used
* by the application to avoid non-deterministic failures on Windows * by the application to avoid non-deterministic failures on Windows
* due to locked directories and left-overs from previous tests. */ * due to locked directories and left-overs from previous tests. */

2
tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp
View File

@ -28,7 +28,7 @@
#include <QtCore/QCoreApplication> #include <QtCore/QCoreApplication>
#include <QtNetwork/QtNetwork> #include <QtNetwork/QtNetwork>
#include <QtTest/QtTest> #include <QTest>
#include "../../../network-settings.h" #include "../../../network-settings.h"

2
tests/auto/corelib/io/qipaddress/tst_qipaddress.cpp
View File

@ -27,7 +27,7 @@
****************************************************************************/ ****************************************************************************/
#include <QtCore/QString> #include <QtCore/QString>
#include <QtTest/QtTest> #include <QTest>
#include <QtCore/private/qipaddress_p.h> #include <QtCore/private/qipaddress_p.h>
#ifdef __GLIBC__ #ifdef __GLIBC__

7
tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp
View File

@ -27,8 +27,12 @@
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <QtConcurrentRun> #include <QtConcurrentRun>
#include <QProcess>
#include <QSemaphore>
#include <QFutureSynchronizer>
#include <qlockfile.h> #include <qlockfile.h>
#include <qtemporarydir.h> #include <qtemporarydir.h>
#include <qsysinfo.h> #include <qsysinfo.h>
@ -37,6 +41,7 @@
#include <sys/time.h> #include <sys/time.h>
#elif defined(Q_OS_WIN) #elif defined(Q_OS_WIN)
# include <qt_windows.h> # include <qt_windows.h>
# include <QOperatingSystemVersion>
#endif #endif
#include <private/qlockfile_p.h> // for getLockFileHandle() #include <private/qlockfile_p.h> // for getLockFileHandle()

2
tests/auto/corelib/io/qloggingcategory/tst_qloggingcategory.cpp
View File

@ -26,7 +26,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest> #include <QTest>
#include <QMutexLocker> #include <QMutexLocker>
#include <QLoggingCategory> #include <QLoggingCategory>

3
tests/auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp
View File

@ -26,8 +26,9 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest> #include <QTest>
#include <QLoggingCategory> #include <QLoggingCategory>
#include <QStandardPaths>
#include <QtCore/private/qloggingregistry_p.h> #include <QtCore/private/qloggingregistry_p.h>

2
tests/auto/corelib/io/qnodebug/tst_qnodebug.cpp
View File

@ -37,7 +37,7 @@
#include <QtCore/QtCore> #include <QtCore/QtCore>
#include <QtCore/QtDebug> #include <QtCore/QtDebug>
#include <QtCore/QLoggingCategory> #include <QtCore/QLoggingCategory>
#include <QtTest/QtTest> #include <QTest>
class tst_QNoDebug: public QObject class tst_QNoDebug: public QObject
{ {

2
tests/auto/corelib/io/qprocess-noapplication/tst_qprocessnoapplication.cpp
View File

@ -29,7 +29,7 @@
#include <QtCore/QCoreApplication> #include <QtCore/QCoreApplication>
#include <QtCore/QProcess> #include <QtCore/QProcess>
#include <QtCore/QThread> #include <QtCore/QThread>
#include <QtTest> #include <QTest>
class tst_QProcessNoApplication : public QObject class tst_QProcessNoApplication : public QObject
{ {

5
tests/auto/corelib/io/qprocess/tst_qprocess.cpp
View File

@ -29,7 +29,10 @@
#include <emulationdetector.h> #include <emulationdetector.h>
#include <QtTest/QtTest> #include <QTest>
#include <QTestEventLoop>
#include <QSignalSpy>
#include <QtCore/QProcess> #include <QtCore/QProcess>
#include <QtCore/QDir> #include <QtCore/QDir>
#include <QtCore/QElapsedTimer> #include <QtCore/QElapsedTimer>

2
tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp
View File

@ -26,7 +26,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest> #include <QTest>
#include <QObject> #include <QObject>
#include <QProcessEnvironment> #include <QProcessEnvironment>

4
tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp
View File

@ -27,7 +27,9 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <QResource>
#include <QtPlugin>
#include <QtCore/QCoreApplication> #include <QtCore/QCoreApplication>
#include <QtCore/QScopeGuard> #include <QtCore/QScopeGuard>
#include <QtCore/private/qglobal_p.h> #include <QtCore/private/qglobal_p.h>

3
tests/auto/corelib/io/qsavefile/tst_qsavefile.cpp
View File

@ -26,7 +26,8 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <QSaveFile>
#include <qcoreapplication.h> #include <qcoreapplication.h>
#include <qstring.h> #include <qstring.h>
#include <qtemporaryfile.h> #include <qtemporaryfile.h>

2
tests/auto/corelib/io/qsettings/tst_qsettings.cpp
View File

@ -27,7 +27,7 @@
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <QtCore/QSettings> #include <QtCore/QSettings>
#include <private/qsettings_p.h> #include <private/qsettings_p.h>

3
tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp
View File

@ -28,7 +28,8 @@
****************************************************************************/ ****************************************************************************/
#include <qstandardpaths.h> #include <qstandardpaths.h>
#include <QtTest/QtTest> #include <QTest>
#include <QOperatingSystemVersion>
#include <qdebug.h> #include <qdebug.h>
#include <qfileinfo.h> #include <qfileinfo.h>
#include <qplatformdefs.h> #include <qplatformdefs.h>

3
tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
View File

@ -26,8 +26,9 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <QStorageInfo> #include <QStorageInfo>
#include <QTemporaryFile>
#include <stdarg.h> #include <stdarg.h>

3
tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp
View File

@ -27,7 +27,8 @@
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <QStandardPaths>
#include <qcoreapplication.h> #include <qcoreapplication.h>
#include <qstring.h> #include <qstring.h>
#include <qtemporarydir.h> #include <qtemporarydir.h>

7
tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp
View File

@ -27,7 +27,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <qcoreapplication.h> #include <qcoreapplication.h>
#include <qstring.h> #include <qstring.h>
#include <qtemporarydir.h> #include <qtemporarydir.h>
@ -50,6 +50,11 @@
# include <unistd.h> // close(2) # include <unistd.h> // close(2)
#endif #endif
#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_EMBEDDED)
#include <QDirIterator>
#include <QStandardPaths>
#endif
class tst_QTemporaryFile : public QObject class tst_QTemporaryFile : public QObject
{ {
Q_OBJECT Q_OBJECT

4
tests/auto/corelib/io/qurl/tst_qurl.cpp
View File

@ -28,9 +28,11 @@
****************************************************************************/ ****************************************************************************/
#include <qurl.h> #include <qurl.h>
#include <QtTest/QtTest>
#include <QtCore/QDebug> #include <QtCore/QDebug>
#include <QTest>
#include <QDirIterator>
#include <qcoreapplication.h> #include <qcoreapplication.h>
#include <qfileinfo.h> #include <qfileinfo.h>

2
tests/auto/corelib/io/qurl/tst_qurl_mac.mm
View File

@ -26,7 +26,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <CoreFoundation/CoreFoundation.h> #include <CoreFoundation/CoreFoundation.h>
#include <Foundation/Foundation.h> #include <Foundation/Foundation.h>

2
tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp
View File

@ -28,7 +28,7 @@
****************************************************************************/ ****************************************************************************/
#include <QtCore/QUrl> #include <QtCore/QUrl>
#include <QtTest/QtTest> #include <QTest>
#include "private/qurl_p.h" #include "private/qurl_p.h"

2
tests/auto/corelib/io/qurlinternal/utf8data.cpp
View File

@ -26,7 +26,7 @@
** $QT_END_LICENSE$ ** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
void loadInvalidUtf8Rows() void loadInvalidUtf8Rows()
{ {

6
tests/auto/corelib/io/qurlquery/tst_qurlquery.cpp
View File

@ -27,7 +27,7 @@
****************************************************************************/ ****************************************************************************/
#include <QtCore/QUrlQuery> #include <QtCore/QUrlQuery>
#include <QtTest/QtTest> #include <QTest>
typedef QList<QPair<QString, QString> > QueryItems; typedef QList<QPair<QString, QString> > QueryItems;
Q_DECLARE_METATYPE(QueryItems) Q_DECLARE_METATYPE(QueryItems)
@ -73,11 +73,11 @@ static QString prettyElement(const QString &key, const QString &value)
if (key.isNull()) if (key.isNull())
result += "null -> "; result += "null -> ";
else else
result += '"' % key % "\" -> "; result += '"' + key + "\" -> ";
if (value.isNull()) if (value.isNull())
result += "null"; result += "null";
else else
result += '"' % value % '"'; result += '"' + value + '"';
return result; return result;
} }

5
tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp
View File

@ -26,9 +26,9 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <QtCore/QCoreApplication>
#include <QtCore/QCoreApplication>
#include <QtCore/QSortFilterProxyModel> #include <QtCore/QSortFilterProxyModel>
#include <QtCore/QStringListModel> #include <QtCore/QStringListModel>
#include <QtGui/QStandardItemModel> #include <QtGui/QStandardItemModel>
@ -37,6 +37,7 @@
// for testing QModelRoleDataSpan construction // for testing QModelRoleDataSpan construction
#include <QVarLengthArray> #include <QVarLengthArray>
#include <QSignalSpy>
#include <array> #include <array>
#include <vector> #include <vector>
#include <deque> #include <deque>

2
tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp
View File

@ -26,7 +26,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <qabstractproxymodel.h> #include <qabstractproxymodel.h>
#include <QItemSelection> #include <QItemSelection>
#include <qstandarditemmodel.h> #include <qstandarditemmodel.h>

2
tests/auto/corelib/itemmodels/qitemmodel/modelstotest.cpp
View File

@ -27,7 +27,7 @@
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <QtCore/QCoreApplication> #include <QtCore/QCoreApplication>
#include <QtSql/QtSql> #include <QtSql/QtSql>
#include <QtWidgets/QtWidgets> #include <QtWidgets/QtWidgets>

3
tests/auto/corelib/itemmodels/qitemmodel/tst_qitemmodel.cpp
View File

@ -26,7 +26,8 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <QSignalSpy>
#include <QtCore/QCoreApplication> #include <QtCore/QCoreApplication>
#include <qdebug.h> #include <qdebug.h>
#include "modelstotest.cpp" #include "modelstotest.cpp"

3
tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp
View File

@ -26,7 +26,8 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <QSignalSpy>
#include <QtGui/QtGui> #include <QtGui/QtGui>

5
tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp
View File

@ -36,7 +36,10 @@
#include <QStringListModel> #include <QStringListModel>
#include <QTableView> #include <QTableView>
#include <QTreeView> #include <QTreeView>
#include <QtTest> #include <QTest>
#include <QStack>
#include <QSignalSpy>
#include <QAbstractItemModelTester>
Q_LOGGING_CATEGORY(lcItemModels, "qt.corelib.tests.itemmodels") Q_LOGGING_CATEGORY(lcItemModels, "qt.corelib.tests.itemmodels")

3
tests/auto/corelib/itemmodels/qsortfilterproxymodel_regularexpression/tst_qsortfilterproxymodel_regularexpression.cpp
View File

@ -26,7 +26,8 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <QStringListModel>
#include "tst_qsortfilterproxymodel.h" #include "tst_qsortfilterproxymodel.h"

3
tests/auto/corelib/itemmodels/qstringlistmodel/tst_qstringlistmodel.cpp
View File

@ -26,7 +26,8 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <QSignalSpy>
#include <qabstractitemmodel.h> #include <qabstractitemmodel.h>
#include <qcoreapplication.h> #include <qcoreapplication.h>
#include <qmap.h> #include <qmap.h>

2
tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp
View File

@ -30,7 +30,7 @@
#include "tst_qcoreapplication.h" #include "tst_qcoreapplication.h"
#include <QtCore/QtCore> #include <QtCore/QtCore>
#include <QtTest/QtTest> #include <QTest>
#include <private/qcoreapplication_p.h> #include <private/qcoreapplication_p.h>
#include <private/qeventloop_p.h> #include <private/qeventloop_p.h>

3
tests/auto/corelib/kernel/qdeadlinetimer/tst_qdeadlinetimer.cpp
View File

@ -30,7 +30,8 @@
#include <QtCore/QTime> #include <QtCore/QTime>
#include <QtCore/QDeadlineTimer> #include <QtCore/QDeadlineTimer>
#include <QtCore/QElapsedTimer> #include <QtCore/QElapsedTimer>
#include <QtTest/QtTest> #include <QTest>
#include <QTimer>
#if __has_include(<chrono>) #if __has_include(<chrono>)
# include <chrono> # include <chrono>

3
tests/auto/corelib/kernel/qelapsedtimer/tst_qelapsedtimer.cpp
View File

@ -29,7 +29,8 @@
#include <QtCore/QString> #include <QtCore/QString>
#include <QtCore/QTime> #include <QtCore/QTime>
#include <QtCore/QElapsedTimer> #include <QtCore/QElapsedTimer>
#include <QtTest/QtTest> #include <QTest>
#include <QTimer>
static const int minResolution = 100; // the minimum resolution for the tests static const int minResolution = 100; // the minimum resolution for the tests

4
tests/auto/corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp
View File

@ -32,7 +32,9 @@
#else #else
# include <QtCore/QCoreApplication> # include <QtCore/QCoreApplication>
#endif #endif
#include <QtTest/QtTest> #include <QTest>
#include <QAbstractEventDispatcher>
#include <QTimer>
enum { enum {
PreciseTimerInterval = 10, PreciseTimerInterval = 10,

3
tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp
View File

@ -26,7 +26,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <qabstracteventdispatcher.h> #include <qabstracteventdispatcher.h>
#include <qcoreapplication.h> #include <qcoreapplication.h>
@ -46,6 +46,7 @@
#include <qwaitcondition.h> #include <qwaitcondition.h>
#include <QTcpServer> #include <QTcpServer>
#include <QTcpSocket> #include <QTcpSocket>
#include <QSignalSpy>
class EventLoopExiter : public QObject class EventLoopExiter : public QObject
{ {

2
tests/auto/corelib/kernel/qmath/tst_qmath.cpp
View File

@ -27,7 +27,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <qmath.h> #include <qmath.h>
class tst_QMath : public QObject class tst_QMath : public QObject

2
tests/auto/corelib/kernel/qmetaenum/tst_qmetaenum.cpp
View File

@ -27,7 +27,7 @@
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <QtCore/qobject.h> #include <QtCore/qobject.h>
#include <QtCore/qmetaobject.h> #include <QtCore/qmetaobject.h>

3
tests/auto/corelib/kernel/qmetamethod/tst_qmetamethod.cpp
View File

@ -28,7 +28,8 @@
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <QTypeRevision>
#include <qobject.h> #include <qobject.h>
#include <qmetaobject.h> #include <qmetaobject.h>

4
tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp
View File

@ -26,7 +26,9 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <QSignalSpy>
#include <QSortFilterProxyModel>
#include <qobject.h> #include <qobject.h>
#include <qmetaobject.h> #include <qmetaobject.h>

3
tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
View File

@ -26,7 +26,8 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <QSignalSpy>
#include <QtCore/qlocale.h> #include <QtCore/qlocale.h>
#include <private/qmetaobjectbuilder_p.h> #include <private/qmetaobjectbuilder_p.h>

2
tests/auto/corelib/kernel/qmetaproperty/tst_qmetaproperty.cpp
View File

@ -28,7 +28,7 @@
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <qobject.h> #include <qobject.h>
#include <qmetaobject.h> #include <qmetaobject.h>

2
tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
View File

@ -28,7 +28,7 @@
#include <QtCore> #include <QtCore>
#include <QtTest/QtTest> #include <QTest>
#include <QtCore/private/qmetaobjectbuilder_p.h> #include <QtCore/private/qmetaobjectbuilder_p.h>
#include "tst_qmetatype.h" #include "tst_qmetatype.h"

2
tests/auto/corelib/kernel/qmimedata/tst_qmimedata.cpp
View File

@ -26,7 +26,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <QMimeData> #include <QMimeData>

5
tests/auto/corelib/kernel/qobject/tst_qobject.cpp
View File

@ -27,7 +27,10 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <QStringListModel>
#include <QAbstractEventDispatcher>
#include <QScopedValueRollback>
#include <qcoreapplication.h> #include <qcoreapplication.h>
#include <qpointer.h> #include <qpointer.h>

4
tests/auto/corelib/kernel/qpointer/tst_qpointer.cpp
View File

@ -26,7 +26,9 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <QRunnable>
#include <QThreadPool>
#include <QPointer> #include <QPointer>
#ifndef QT_NO_WIDGETS #ifndef QT_NO_WIDGETS

2
tests/auto/corelib/kernel/qsignalblocker/tst_qsignalblocker.cpp
View File

@ -26,7 +26,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include "qobject.h" #include "qobject.h"

2
tests/auto/corelib/kernel/qsignalmapper/tst_qsignalmapper.cpp
View File

@ -26,7 +26,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <qsignalmapper.h> #include <qsignalmapper.h>

4
tests/auto/corelib/kernel/qsystemsemaphore/tst_qsystemsemaphore.cpp
View File

@ -26,7 +26,9 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QTest>
#include <QProcess>
#include <QtCore/QList> #include <QtCore/QList>
#include <QtCore/QSystemSemaphore> #include <QtCore/QSystemSemaphore>
#include <QtCore/QTemporaryDir> #include <QtCore/QTemporaryDir>

Some files were not shown because too many files have changed in this diff Show More