diff options
Diffstat (limited to 'tests/benchmarks/corelib')
17 files changed, 21 insertions, 17 deletions
diff --git a/tests/benchmarks/corelib/io/qdir/10000/bench_qdir_10000.cpp b/tests/benchmarks/corelib/io/qdir/10000/bench_qdir_10000.cpp index d1aba9fa5f..894cf83de9 100644 --- a/tests/benchmarks/corelib/io/qdir/10000/bench_qdir_10000.cpp +++ b/tests/benchmarks/corelib/io/qdir/10000/bench_qdir_10000.cpp @@ -26,7 +26,8 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> +#include <QDirIterator> #ifdef Q_OS_WIN # include <windows.h> diff --git a/tests/benchmarks/corelib/io/qfileinfo/main.cpp b/tests/benchmarks/corelib/io/qfileinfo/main.cpp index f4c4f815da..3cf9709d09 100644 --- a/tests/benchmarks/corelib/io/qfileinfo/main.cpp +++ b/tests/benchmarks/corelib/io/qfileinfo/main.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ #include <QDebug> #include <qtest.h> -#include <QtTest/QtTest> +#include <QTest> #include <QtCore/QCoreApplication> #include <QtCore/QFileInfo> #include <QtCore/QFile> diff --git a/tests/benchmarks/corelib/io/qprocess/tst_bench_qprocess.cpp b/tests/benchmarks/corelib/io/qprocess/tst_bench_qprocess.cpp index 1fd3b9d5da..7077ec631a 100644 --- a/tests/benchmarks/corelib/io/qprocess/tst_bench_qprocess.cpp +++ b/tests/benchmarks/corelib/io/qprocess/tst_bench_qprocess.cpp @@ -26,7 +26,8 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> +#include <QSignalSpy> #include <QtCore/QProcess> #include <QtCore/QElapsedTimer> diff --git a/tests/benchmarks/corelib/json/tst_bench_qtjson.cpp b/tests/benchmarks/corelib/json/tst_bench_qtjson.cpp index fe0d2ef4d4..1dc7fb322c 100644 --- a/tests/benchmarks/corelib/json/tst_bench_qtjson.cpp +++ b/tests/benchmarks/corelib/json/tst_bench_qtjson.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include <QtTest> +#include <QTest> #include <qjsondocument.h> #include <qjsonobject.h> diff --git a/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/tst_qtimer_vs_qmetaobject.cpp b/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/tst_qtimer_vs_qmetaobject.cpp index 6af5b8d586..52a726b292 100644 --- a/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/tst_qtimer_vs_qmetaobject.cpp +++ b/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/tst_qtimer_vs_qmetaobject.cpp @@ -27,8 +27,9 @@ ****************************************************************************/ #include <QtCore> -#include <QtTest/QtTest> +#include <QTest> #include <QThread> +#include <QSignalSpy> #define INVOKE_COUNT 10000 diff --git a/tests/benchmarks/corelib/kernel/qwineventnotifier/main.cpp b/tests/benchmarks/corelib/kernel/qwineventnotifier/main.cpp index 5ee59f8fb8..926ed5acdb 100644 --- a/tests/benchmarks/corelib/kernel/qwineventnotifier/main.cpp +++ b/tests/benchmarks/corelib/kernel/qwineventnotifier/main.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <QtCore/qglobal.h> #include <QtCore/qwineventnotifier.h> #include <QtCore/qeventloop.h> diff --git a/tests/benchmarks/corelib/mimetypes/qmimedatabase/main.cpp b/tests/benchmarks/corelib/mimetypes/qmimedatabase/main.cpp index 1b432f3b3e..900e7028a4 100644 --- a/tests/benchmarks/corelib/mimetypes/qmimedatabase/main.cpp +++ b/tests/benchmarks/corelib/mimetypes/qmimedatabase/main.cpp @@ -26,7 +26,8 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> +#include <QMimeDatabase> class tst_QMimeDatabase: public QObject { diff --git a/tests/benchmarks/corelib/plugin/quuid/tst_quuid.cpp b/tests/benchmarks/corelib/plugin/quuid/tst_quuid.cpp index b52654d1b4..3e7f520b76 100644 --- a/tests/benchmarks/corelib/plugin/quuid/tst_quuid.cpp +++ b/tests/benchmarks/corelib/plugin/quuid/tst_quuid.cpp @@ -28,7 +28,7 @@ #include <QtCore/QCoreApplication> #include <QtCore/QUuid> -#include <QtTest/QtTest> +#include <QTest> class tst_bench_QUuid : public QObject { diff --git a/tests/benchmarks/corelib/text/qchar/main.cpp b/tests/benchmarks/corelib/text/qchar/main.cpp index 4dcf86786d..746f9730f7 100644 --- a/tests/benchmarks/corelib/text/qchar/main.cpp +++ b/tests/benchmarks/corelib/text/qchar/main.cpp @@ -25,7 +25,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <QChar> class tst_QChar: public QObject diff --git a/tests/benchmarks/corelib/text/qstring/main.cpp b/tests/benchmarks/corelib/text/qstring/main.cpp index 35db568b82..0214931b71 100644 --- a/tests/benchmarks/corelib/text/qstring/main.cpp +++ b/tests/benchmarks/corelib/text/qstring/main.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ #include <QStringList> #include <QFile> -#include <QtTest/QtTest> +#include <QTest> class tst_QString: public QObject { diff --git a/tests/benchmarks/corelib/text/qstringlist/main.cpp b/tests/benchmarks/corelib/text/qstringlist/main.cpp index 9f184d0cf5..eb507c7c64 100644 --- a/tests/benchmarks/corelib/text/qstringlist/main.cpp +++ b/tests/benchmarks/corelib/text/qstringlist/main.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ #include <QStringList> -#include <QtTest> +#include <QTest> #include <sstream> #include <string> diff --git a/tests/benchmarks/corelib/thread/qmutex/tst_qmutex.cpp b/tests/benchmarks/corelib/thread/qmutex/tst_qmutex.cpp index 1482c21a85..f010b05e54 100644 --- a/tests/benchmarks/corelib/thread/qmutex/tst_qmutex.cpp +++ b/tests/benchmarks/corelib/thread/qmutex/tst_qmutex.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ #include <QtCore/QtCore> -#include <QtTest/QtTest> +#include <QTest> #include <math.h> diff --git a/tests/benchmarks/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp b/tests/benchmarks/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp index 12059b375f..1018dae878 100644 --- a/tests/benchmarks/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp +++ b/tests/benchmarks/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ #include <QtCore/QtCore> -#include <QtTest/QtTest> +#include <QTest> #include <mutex> #if __has_include(<shared_mutex>) #if __cplusplus > 201103L diff --git a/tests/benchmarks/corelib/thread/qwaitcondition/tst_qwaitcondition.cpp b/tests/benchmarks/corelib/thread/qwaitcondition/tst_qwaitcondition.cpp index 7568b769c8..4e31dd4009 100644 --- a/tests/benchmarks/corelib/thread/qwaitcondition/tst_qwaitcondition.cpp +++ b/tests/benchmarks/corelib/thread/qwaitcondition/tst_qwaitcondition.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ #include <QtCore/QtCore> -#include <QtTest/QtTest> +#include <QTest> #include <math.h> diff --git a/tests/benchmarks/corelib/tools/qcryptographichash/main.cpp b/tests/benchmarks/corelib/tools/qcryptographichash/main.cpp index 1d414161d1..792132cc47 100644 --- a/tests/benchmarks/corelib/tools/qcryptographichash/main.cpp +++ b/tests/benchmarks/corelib/tools/qcryptographichash/main.cpp @@ -31,7 +31,7 @@ #include <QFile> #include <QRandomGenerator> #include <QString> -#include <QtTest> +#include <QTest> #include <time.h> diff --git a/tests/benchmarks/corelib/tools/qstack/main.cpp b/tests/benchmarks/corelib/tools/qstack/main.cpp index c9466ef2e1..c69e5c3ed8 100644 --- a/tests/benchmarks/corelib/tools/qstack/main.cpp +++ b/tests/benchmarks/corelib/tools/qstack/main.cpp @@ -28,7 +28,7 @@ #include <QStack> #include <QDebug> -#include <QtTest> +#include <QTest> #include <vector> diff --git a/tests/benchmarks/corelib/tools/qvector/main.cpp b/tests/benchmarks/corelib/tools/qvector/main.cpp index 0bd0dacb3a..b090c04480 100644 --- a/tests/benchmarks/corelib/tools/qvector/main.cpp +++ b/tests/benchmarks/corelib/tools/qvector/main.cpp @@ -28,7 +28,7 @@ #include <QVector> #include <QDebug> -#include <QtTest> +#include <QTest> #include "qrawvector.h" |