diff options
Diffstat (limited to 'tests/auto/corelib/thread')
20 files changed, 38 insertions, 21 deletions
diff --git a/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp b/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp index 14d393aede..1f0d9e7779 100644 --- a/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp +++ b/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <QAtomicInt> #include <QCoreApplication> diff --git a/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp b/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp index 8da52c95fb..dce27ee9c1 100644 --- a/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp +++ b/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp @@ -50,7 +50,7 @@ # endif #endif -#include <QtTest> +#include <QTest> #include <QAtomicInt> #include <limits> diff --git a/tests/auto/corelib/thread/qatomicpointer/tst_qatomicpointer.cpp b/tests/auto/corelib/thread/qatomicpointer/tst_qatomicpointer.cpp index c2aff5a70a..6ca0d3c227 100644 --- a/tests/auto/corelib/thread/qatomicpointer/tst_qatomicpointer.cpp +++ b/tests/auto/corelib/thread/qatomicpointer/tst_qatomicpointer.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <qatomic.h> #include <limits.h> diff --git a/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp index df8948f767..ac7564f36a 100644 --- a/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp +++ b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp @@ -27,10 +27,14 @@ ****************************************************************************/ #include <QCoreApplication> #include <QDebug> +#include <QSemaphore> +#include <QTestEventLoop> +#include <QTimer> +#include <QSignalSpy> #define QFUTURE_TEST -#include <QtTest/QtTest> +#include <QTest> #include <qfuture.h> #include <qfuturewatcher.h> #include <qresultstore.h> diff --git a/tests/auto/corelib/thread/qfuturesynchronizer/tst_qfuturesynchronizer.cpp b/tests/auto/corelib/thread/qfuturesynchronizer/tst_qfuturesynchronizer.cpp index a05687f4e5..ab42bdf341 100644 --- a/tests/auto/corelib/thread/qfuturesynchronizer/tst_qfuturesynchronizer.cpp +++ b/tests/auto/corelib/thread/qfuturesynchronizer/tst_qfuturesynchronizer.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include <QtTest> +#include <QTest> #include <QtCore/qfuturesynchronizer.h> #include <QtCore/qfuture.h> diff --git a/tests/auto/corelib/thread/qfuturewatcher/tst_qfuturewatcher.cpp b/tests/auto/corelib/thread/qfuturewatcher/tst_qfuturewatcher.cpp index e5952e7c8d..0d759eebd6 100644 --- a/tests/auto/corelib/thread/qfuturewatcher/tst_qfuturewatcher.cpp +++ b/tests/auto/corelib/thread/qfuturewatcher/tst_qfuturewatcher.cpp @@ -28,14 +28,14 @@ #include <QCoreApplication> #include <QDebug> #include <QElapsedTimer> -#include <QtTest/QtTest> +#include <QSignalSpy> #include <QtConcurrent> #include <private/qfutureinterface_p.h> using namespace QtConcurrent; -#include <QtTest/QtTest> +#include <QTest> //#define PRINT diff --git a/tests/auto/corelib/thread/qmutex/tst_qmutex.cpp b/tests/auto/corelib/thread/qmutex/tst_qmutex.cpp index 88ecee7999..fb080a1a12 100644 --- a/tests/auto/corelib/thread/qmutex/tst_qmutex.cpp +++ b/tests/auto/corelib/thread/qmutex/tst_qmutex.cpp @@ -27,7 +27,8 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> +#include <QSemaphore> #include <qatomic.h> #include <qcoreapplication.h> diff --git a/tests/auto/corelib/thread/qmutexlocker/tst_qmutexlocker.cpp b/tests/auto/corelib/thread/qmutexlocker/tst_qmutexlocker.cpp index 30268890ed..d873291fd6 100644 --- a/tests/auto/corelib/thread/qmutexlocker/tst_qmutexlocker.cpp +++ b/tests/auto/corelib/thread/qmutexlocker/tst_qmutexlocker.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <QCoreApplication> #include <QMutexLocker> diff --git a/tests/auto/corelib/thread/qpromise/snippet_qpromise.cpp b/tests/auto/corelib/thread/qpromise/snippet_qpromise.cpp index fec23c1e81..2e7b8832d3 100644 --- a/tests/auto/corelib/thread/qpromise/snippet_qpromise.cpp +++ b/tests/auto/corelib/thread/qpromise/snippet_qpromise.cpp @@ -53,7 +53,7 @@ // snippet license. #include <QCoreApplication> -#include <QtTest/QtTest> +#include <QTest> #include <qfuture.h> #include <qfuturewatcher.h> diff --git a/tests/auto/corelib/thread/qpromise/tst_qpromise.cpp b/tests/auto/corelib/thread/qpromise/tst_qpromise.cpp index 74a3059699..b956619e11 100644 --- a/tests/auto/corelib/thread/qpromise/tst_qpromise.cpp +++ b/tests/auto/corelib/thread/qpromise/tst_qpromise.cpp @@ -30,7 +30,7 @@ #define QPROMISE_TEST -#include <QtTest/QtTest> +#include <QTest> #include <qfuture.h> #include <qfuturewatcher.h> #include <qpromise.h> diff --git a/tests/auto/corelib/thread/qreadlocker/tst_qreadlocker.cpp b/tests/auto/corelib/thread/qreadlocker/tst_qreadlocker.cpp index 8f0b182d05..c270aa2683 100644 --- a/tests/auto/corelib/thread/qreadlocker/tst_qreadlocker.cpp +++ b/tests/auto/corelib/thread/qreadlocker/tst_qreadlocker.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <QCoreApplication> #include <QReadLocker> diff --git a/tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp b/tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp index 12bc4ba6af..ca282e2723 100644 --- a/tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp +++ b/tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp @@ -26,7 +26,8 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> +#include <QSemaphore> #include <qcoreapplication.h> #include <qreadwritelock.h> #include <qelapsedtimer.h> diff --git a/tests/auto/corelib/thread/qresultstore/tst_qresultstore.cpp b/tests/auto/corelib/thread/qresultstore/tst_qresultstore.cpp index dff599180c..10ac19137e 100644 --- a/tests/auto/corelib/thread/qresultstore/tst_qresultstore.cpp +++ b/tests/auto/corelib/thread/qresultstore/tst_qresultstore.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <qresultstore.h> diff --git a/tests/auto/corelib/thread/qsemaphore/tst_qsemaphore.cpp b/tests/auto/corelib/thread/qsemaphore/tst_qsemaphore.cpp index bce0088463..9f1512bc44 100644 --- a/tests/auto/corelib/thread/qsemaphore/tst_qsemaphore.cpp +++ b/tests/auto/corelib/thread/qsemaphore/tst_qsemaphore.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <qcoreapplication.h> #include <qthread.h> diff --git a/tests/auto/corelib/thread/qthread/tst_qthread.cpp b/tests/auto/corelib/thread/qthread/tst_qthread.cpp index 3f5b255be4..a34129d59a 100644 --- a/tests/auto/corelib/thread/qthread/tst_qthread.cpp +++ b/tests/auto/corelib/thread/qthread/tst_qthread.cpp @@ -26,7 +26,11 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> +#include <QTestEventLoop> +#include <QSemaphore> +#include <QAbstractEventDispatcher> +#include <QWinEventNotifier> #include <qcoreapplication.h> #include <qelapsedtimer.h> diff --git a/tests/auto/corelib/thread/qthreadonce/tst_qthreadonce.cpp b/tests/auto/corelib/thread/qthreadonce/tst_qthreadonce.cpp index 76974fc5fb..7bb39da85c 100644 --- a/tests/auto/corelib/thread/qthreadonce/tst_qthreadonce.cpp +++ b/tests/auto/corelib/thread/qthreadonce/tst_qthreadonce.cpp @@ -27,7 +27,8 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> +#include <QSemaphore> #include <qcoreapplication.h> #include <qmutex.h> diff --git a/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp b/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp index fb563609e2..eb9dbaa028 100644 --- a/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp +++ b/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp @@ -26,7 +26,10 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <QtTest/QtTest> + +#include <QTest> +#include <QSemaphore> + #include <qelapsedtimer.h> #include <qthreadpool.h> #include <qstring.h> diff --git a/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp b/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp index dfb4953c9d..40bc815c33 100644 --- a/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp +++ b/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp @@ -26,7 +26,9 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> +#include <QProcess> +#include <QTestEventLoop> #include <qcoreapplication.h> #include <qmutex.h> diff --git a/tests/auto/corelib/thread/qwaitcondition/tst_qwaitcondition.cpp b/tests/auto/corelib/thread/qwaitcondition/tst_qwaitcondition.cpp index 9706f34236..56ca0bc53d 100644 --- a/tests/auto/corelib/thread/qwaitcondition/tst_qwaitcondition.cpp +++ b/tests/auto/corelib/thread/qwaitcondition/tst_qwaitcondition.cpp @@ -26,7 +26,8 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> +#include <QReadWriteLock> #include <qatomic.h> #include <qcoreapplication.h> diff --git a/tests/auto/corelib/thread/qwritelocker/tst_qwritelocker.cpp b/tests/auto/corelib/thread/qwritelocker/tst_qwritelocker.cpp index fd0f2d8d7e..2828b529a8 100644 --- a/tests/auto/corelib/thread/qwritelocker/tst_qwritelocker.cpp +++ b/tests/auto/corelib/thread/qwritelocker/tst_qwritelocker.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <QCoreApplication> #include <QWriteLocker> |