44 files changed, 16 insertions, 13 deletions
diff --git a/tests/auto/corelib.pro b/tests/auto/corelib.pro
index f3b78c6e85..1467db7287 100644
--- a/tests/auto/corelib.pro
+++ b/tests/auto/corelib.pro
@@ -3,8 +3,6 @@ SUBDIRS=\
    corelib \
    collections \
    exceptionsafety \
-   qatomicint \
-   qatomicpointer \
    qbitarray \
    qbytearray \
    qbytearraymatcher \
@@ -22,19 +20,14 @@ SUBDIRS=\
    qline \
    qmap \
    qmargins \
-   qmutex \
-   qmutexlocker \
    qobjectrace \
    qpoint \
    qqueue \
-   qreadlocker \
-   qreadwritelock \
    qrect \
    qregexp \
    qringbuffer \
    qscopedpointer \
    qscopedvaluerollback \
-   qsemaphore \
    qset \
    qsharedpointer \
    qsignalspy \
@@ -50,16 +43,11 @@ SUBDIRS=\
    qstringmatcher \
    qstringref \
    qtextboundaryfinder \
-   qthread \
-   qthreadonce \
-   qthreadstorage \
    qtime \
    qtimeline \
    qtmd5 \
    qtokenautomaton \
    qvarlengtharray \
    qvector \
-   qwaitcondition \
-   qwritelocker \
    selftests \
    utf8
diff --git a/tests/auto/corelib/corelib.pro b/tests/auto/corelib/corelib.pro
index 03a7035af0..62532b968f 100644
--- a/tests/auto/corelib/corelib.pro
+++ b/tests/auto/corelib/corelib.pro
@@ -7,4 +7,5 @@ SUBDIRS=\
    io \
    kernel \
    plugin \
-   statemachine
+   statemachine \
+   thread
diff --git a/tests/auto/qatomicint/.gitignore b/tests/auto/corelib/thread/qatomicint/.gitignore
index 52998efd02..52998efd02 100644
--- a/tests/auto/qatomicint/.gitignore
+++ b/tests/auto/corelib/thread/qatomicint/.gitignore
diff --git a/tests/auto/qatomicint/qatomicint.pro b/tests/auto/corelib/thread/qatomicint/qatomicint.pro
index 7850d93dc7..7850d93dc7 100644
--- a/tests/auto/qatomicint/qatomicint.pro
+++ b/tests/auto/corelib/thread/qatomicint/qatomicint.pro
diff --git a/tests/auto/qatomicint/tst_qatomicint.cpp b/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp
index 27a2cc2e9c..27a2cc2e9c 100644
--- a/tests/auto/qatomicint/tst_qatomicint.cpp
+++ b/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp
diff --git a/tests/auto/qatomicpointer/.gitignore b/tests/auto/corelib/thread/qatomicpointer/.gitignore
index 2843c40749..2843c40749 100644
--- a/tests/auto/qatomicpointer/.gitignore
+++ b/tests/auto/corelib/thread/qatomicpointer/.gitignore
diff --git a/tests/auto/qatomicpointer/qatomicpointer.pro b/tests/auto/corelib/thread/qatomicpointer/qatomicpointer.pro
index 89ff137d39..89ff137d39 100644
--- a/tests/auto/qatomicpointer/qatomicpointer.pro
+++ b/tests/auto/corelib/thread/qatomicpointer/qatomicpointer.pro
diff --git a/tests/auto/qatomicpointer/tst_qatomicpointer.cpp b/tests/auto/corelib/thread/qatomicpointer/tst_qatomicpointer.cpp
index 42e744aaa6..42e744aaa6 100644
--- a/tests/auto/qatomicpointer/tst_qatomicpointer.cpp
+++ b/tests/auto/corelib/thread/qatomicpointer/tst_qatomicpointer.cpp
diff --git a/tests/auto/qmutex/.gitignore b/tests/auto/corelib/thread/qmutex/.gitignore
index 2f6b74166f..2f6b74166f 100644
--- a/tests/auto/qmutex/.gitignore
+++ b/tests/auto/corelib/thread/qmutex/.gitignore
diff --git a/tests/auto/qmutex/qmutex.pro b/tests/auto/corelib/thread/qmutex/qmutex.pro
index 608b08e16e..608b08e16e 100644
--- a/tests/auto/qmutex/qmutex.pro
+++ b/tests/auto/corelib/thread/qmutex/qmutex.pro
diff --git a/tests/auto/qmutex/tst_qmutex.cpp b/tests/auto/corelib/thread/qmutex/tst_qmutex.cpp
index 7ad6a98a4d..7ad6a98a4d 100644
--- a/tests/auto/qmutex/tst_qmutex.cpp
+++ b/tests/auto/corelib/thread/qmutex/tst_qmutex.cpp
diff --git a/tests/auto/qmutexlocker/.gitignore b/tests/auto/corelib/thread/qmutexlocker/.gitignore
index 7c75c1c2f4..7c75c1c2f4 100644
--- a/tests/auto/qmutexlocker/.gitignore
+++ b/tests/auto/corelib/thread/qmutexlocker/.gitignore
diff --git a/tests/auto/qmutexlocker/qmutexlocker.pro b/tests/auto/corelib/thread/qmutexlocker/qmutexlocker.pro
index 01c369101b..01c369101b 100644
--- a/tests/auto/qmutexlocker/qmutexlocker.pro
+++ b/tests/auto/corelib/thread/qmutexlocker/qmutexlocker.pro
diff --git a/tests/auto/qmutexlocker/tst_qmutexlocker.cpp b/tests/auto/corelib/thread/qmutexlocker/tst_qmutexlocker.cpp
index a663b60be7..a663b60be7 100644
--- a/tests/auto/qmutexlocker/tst_qmutexlocker.cpp
+++ b/tests/auto/corelib/thread/qmutexlocker/tst_qmutexlocker.cpp
diff --git a/tests/auto/qreadlocker/.gitignore b/tests/auto/corelib/thread/qreadlocker/.gitignore
index 2539362670..2539362670 100644
--- a/tests/auto/qreadlocker/.gitignore
+++ b/tests/auto/corelib/thread/qreadlocker/.gitignore
diff --git a/tests/auto/qreadlocker/qreadlocker.pro b/tests/auto/corelib/thread/qreadlocker/qreadlocker.pro
index ee533070a7..ee533070a7 100644
--- a/tests/auto/qreadlocker/qreadlocker.pro
+++ b/tests/auto/corelib/thread/qreadlocker/qreadlocker.pro
diff --git a/tests/auto/qreadlocker/tst_qreadlocker.cpp b/tests/auto/corelib/thread/qreadlocker/tst_qreadlocker.cpp
index 3ec9f1cb25..3ec9f1cb25 100644
--- a/tests/auto/qreadlocker/tst_qreadlocker.cpp
+++ b/tests/auto/corelib/thread/qreadlocker/tst_qreadlocker.cpp
diff --git a/tests/auto/qreadwritelock/.gitignore b/tests/auto/corelib/thread/qreadwritelock/.gitignore
index 96fda685f5..96fda685f5 100644
--- a/tests/auto/qreadwritelock/.gitignore
+++ b/tests/auto/corelib/thread/qreadwritelock/.gitignore
diff --git a/tests/auto/qreadwritelock/qreadwritelock.pro b/tests/auto/corelib/thread/qreadwritelock/qreadwritelock.pro
index 93f7c68dc3..93f7c68dc3 100644
--- a/tests/auto/qreadwritelock/qreadwritelock.pro
+++ b/tests/auto/corelib/thread/qreadwritelock/qreadwritelock.pro
diff --git a/tests/auto/qreadwritelock/tst_qreadwritelock.cpp b/tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp
index 1b995e8d19..1b995e8d19 100644
--- a/tests/auto/qreadwritelock/tst_qreadwritelock.cpp
+++ b/tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp
diff --git a/tests/auto/qsemaphore/.gitignore b/tests/auto/corelib/thread/qsemaphore/.gitignore
index fe86486af4..fe86486af4 100644
--- a/tests/auto/qsemaphore/.gitignore
+++ b/tests/auto/corelib/thread/qsemaphore/.gitignore
diff --git a/tests/auto/qsemaphore/qsemaphore.pro b/tests/auto/corelib/thread/qsemaphore/qsemaphore.pro
index a75bf443bc..a75bf443bc 100644
--- a/tests/auto/qsemaphore/qsemaphore.pro
+++ b/tests/auto/corelib/thread/qsemaphore/qsemaphore.pro
diff --git a/tests/auto/qsemaphore/tst_qsemaphore.cpp b/tests/auto/corelib/thread/qsemaphore/tst_qsemaphore.cpp
index a2c6bf16b7..a2c6bf16b7 100644
--- a/tests/auto/qsemaphore/tst_qsemaphore.cpp
+++ b/tests/auto/corelib/thread/qsemaphore/tst_qsemaphore.cpp
diff --git a/tests/auto/qthread/.gitignore b/tests/auto/corelib/thread/qthread/.gitignore
index 4413a75588..4413a75588 100644
--- a/tests/auto/qthread/.gitignore
+++ b/tests/auto/corelib/thread/qthread/.gitignore
diff --git a/tests/auto/qthread/qthread.pro b/tests/auto/corelib/thread/qthread/qthread.pro
index d3b1028034..d3b1028034 100644
--- a/tests/auto/qthread/qthread.pro
+++ b/tests/auto/corelib/thread/qthread/qthread.pro
diff --git a/tests/auto/qthread/tst_qthread.cpp b/tests/auto/corelib/thread/qthread/tst_qthread.cpp
index 3c46212c16..3c46212c16 100644
--- a/tests/auto/qthread/tst_qthread.cpp
+++ b/tests/auto/corelib/thread/qthread/tst_qthread.cpp
diff --git a/tests/auto/qthreadonce/.gitignore b/tests/auto/corelib/thread/qthreadonce/.gitignore
index 856177d615..856177d615 100644
--- a/tests/auto/qthreadonce/.gitignore
+++ b/tests/auto/corelib/thread/qthreadonce/.gitignore
diff --git a/tests/auto/qthreadonce/qthreadonce.cpp b/tests/auto/corelib/thread/qthreadonce/qthreadonce.cpp
index b23e11b153..b23e11b153 100644
--- a/tests/auto/qthreadonce/qthreadonce.cpp
+++ b/tests/auto/corelib/thread/qthreadonce/qthreadonce.cpp
diff --git a/tests/auto/qthreadonce/qthreadonce.h b/tests/auto/corelib/thread/qthreadonce/qthreadonce.h
index c33625cbde..c33625cbde 100644
--- a/tests/auto/qthreadonce/qthreadonce.h
+++ b/tests/auto/corelib/thread/qthreadonce/qthreadonce.h
diff --git a/tests/auto/qthreadonce/qthreadonce.pro b/tests/auto/corelib/thread/qthreadonce/qthreadonce.pro
index d7ef4d4c23..d7ef4d4c23 100644
--- a/tests/auto/qthreadonce/qthreadonce.pro
+++ b/tests/auto/corelib/thread/qthreadonce/qthreadonce.pro
diff --git a/tests/auto/qthreadonce/tst_qthreadonce.cpp b/tests/auto/corelib/thread/qthreadonce/tst_qthreadonce.cpp
index dea4e43fef..dea4e43fef 100644
--- a/tests/auto/qthreadonce/tst_qthreadonce.cpp
+++ b/tests/auto/corelib/thread/qthreadonce/tst_qthreadonce.cpp
diff --git a/tests/auto/qthreadstorage/.gitignore b/tests/auto/corelib/thread/qthreadstorage/.gitignore
index 301968a8f6..301968a8f6 100644
--- a/tests/auto/qthreadstorage/.gitignore
+++ b/tests/auto/corelib/thread/qthreadstorage/.gitignore
diff --git a/tests/auto/qthreadstorage/crashOnExit.cpp b/tests/auto/corelib/thread/qthreadstorage/crashOnExit.cpp
index 92efcf3b3d..92efcf3b3d 100644
--- a/tests/auto/qthreadstorage/crashOnExit.cpp
+++ b/tests/auto/corelib/thread/qthreadstorage/crashOnExit.cpp
diff --git a/tests/auto/qthreadstorage/crashOnExit.pro b/tests/auto/corelib/thread/qthreadstorage/crashOnExit.pro
index 918ef398ba..918ef398ba 100644
--- a/tests/auto/qthreadstorage/crashOnExit.pro
+++ b/tests/auto/corelib/thread/qthreadstorage/crashOnExit.pro
diff --git a/tests/auto/qthreadstorage/qthreadstorage.pro b/tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro
index 0dc8d086df..0dc8d086df 100644
--- a/tests/auto/qthreadstorage/qthreadstorage.pro
+++ b/tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro
diff --git a/tests/auto/qthreadstorage/tst_qthreadstorage.cpp b/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp
index e123fc4fea..e123fc4fea 100644
--- a/tests/auto/qthreadstorage/tst_qthreadstorage.cpp
+++ b/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp
diff --git a/tests/auto/qthreadstorage/tst_qthreadstorage.pro b/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.pro
index 3071098629..3071098629 100644
--- a/tests/auto/qthreadstorage/tst_qthreadstorage.pro
+++ b/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.pro
diff --git a/tests/auto/qwaitcondition/.gitignore b/tests/auto/corelib/thread/qwaitcondition/.gitignore
index 96531988d9..96531988d9 100644
--- a/tests/auto/qwaitcondition/.gitignore
+++ b/tests/auto/corelib/thread/qwaitcondition/.gitignore
diff --git a/tests/auto/qwaitcondition/qwaitcondition.pro b/tests/auto/corelib/thread/qwaitcondition/qwaitcondition.pro
index 9af0c71301..9af0c71301 100644
--- a/tests/auto/qwaitcondition/qwaitcondition.pro
+++ b/tests/auto/corelib/thread/qwaitcondition/qwaitcondition.pro
diff --git a/tests/auto/qwaitcondition/tst_qwaitcondition.cpp b/tests/auto/corelib/thread/qwaitcondition/tst_qwaitcondition.cpp
index 6545df9189..6545df9189 100644
--- a/tests/auto/qwaitcondition/tst_qwaitcondition.cpp
+++ b/tests/auto/corelib/thread/qwaitcondition/tst_qwaitcondition.cpp
diff --git a/tests/auto/qwritelocker/.gitignore b/tests/auto/corelib/thread/qwritelocker/.gitignore
index 865739ad2c..865739ad2c 100644
--- a/tests/auto/qwritelocker/.gitignore
+++ b/tests/auto/corelib/thread/qwritelocker/.gitignore
diff --git a/tests/auto/qwritelocker/qwritelocker.pro b/tests/auto/corelib/thread/qwritelocker/qwritelocker.pro
index 39a98aaba5..39a98aaba5 100644
--- a/tests/auto/qwritelocker/qwritelocker.pro
+++ b/tests/auto/corelib/thread/qwritelocker/qwritelocker.pro
diff --git a/tests/auto/qwritelocker/tst_qwritelocker.cpp b/tests/auto/corelib/thread/qwritelocker/tst_qwritelocker.cpp
index a06431a5e1..a06431a5e1 100644
--- a/tests/auto/qwritelocker/tst_qwritelocker.cpp
+++ b/tests/auto/corelib/thread/qwritelocker/tst_qwritelocker.cpp
diff --git a/tests/auto/corelib/thread/thread.pro b/tests/auto/corelib/thread/thread.pro
new file mode 100644
index 0000000000..a137748b75
--- /dev/null
+++ b/tests/auto/corelib/thread/thread.pro
@@ -0,0 +1,14 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+    qatomicint \
+    qatomicpointer \
+    qmutex \
+    qmutexlocker \
+    qreadlocker \
+    qreadwritelock \
+    qsemaphore \
+    qthread \
+    qthreadonce \
+    qthreadstorage \
+    qwaitcondition \
+    qwritelocker