Cleanup corelib autotests

Tidy the autotest .pro files.  Most autotest .pro files should look like
this:

CONFIG += testcase
TARGET = tst_something
QT = core testlib
SOURCES = tst_something.cpp

Change-Id: I877c2194e9fa9dd13478d117895e1e255a948ad7
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

12 files changed, 23 insertions, 38 deletions

diff --git a/tests/auto/corelib/thread/qatomicint/qatomicint.pro b/tests/auto/corelib/thread/qatomicint/qatomicint.pro
index dd18c7d6db..eb11268c08 100644
--- a/tests/auto/corelib/thread/qatomicint/qatomicint.pro
+++ b/tests/auto/corelib/thread/qatomicint/qatomicint.pro
@@ -1,5 +1,4 @@
-CONFIG += testcase
+CONFIG += testcase parallel_test
 TARGET = tst_qatomicint
-SOURCES += tst_qatomicint.cpp
 QT = core testlib
-CONFIG += parallel_test
+SOURCES = tst_qatomicint.cpp
diff --git a/tests/auto/corelib/thread/qatomicpointer/qatomicpointer.pro b/tests/auto/corelib/thread/qatomicpointer/qatomicpointer.pro
index dc6c54a2da..ea65ae52af 100644
--- a/tests/auto/corelib/thread/qatomicpointer/qatomicpointer.pro
+++ b/tests/auto/corelib/thread/qatomicpointer/qatomicpointer.pro
@@ -1,5 +1,4 @@
-CONFIG += testcase
+CONFIG += testcase parallel_test
 TARGET = tst_qatomicpointer
-SOURCES += tst_qatomicpointer.cpp
 QT = core testlib
-CONFIG += parallel_test
+SOURCES = tst_qatomicpointer.cpp
diff --git a/tests/auto/corelib/thread/qmutex/qmutex.pro b/tests/auto/corelib/thread/qmutex/qmutex.pro
index cf567c2f65..4aa1dbcc26 100644
--- a/tests/auto/corelib/thread/qmutex/qmutex.pro
+++ b/tests/auto/corelib/thread/qmutex/qmutex.pro
@@ -1,5 +1,4 @@
-CONFIG += testcase
+CONFIG += testcase parallel_test
 TARGET = tst_qmutex
-SOURCES += tst_qmutex.cpp
 QT = core testlib
-CONFIG += parallel_test
+SOURCES = tst_qmutex.cpp
diff --git a/tests/auto/corelib/thread/qmutexlocker/qmutexlocker.pro b/tests/auto/corelib/thread/qmutexlocker/qmutexlocker.pro
index 9e44b5f84c..a8b1fad7a4 100644
--- a/tests/auto/corelib/thread/qmutexlocker/qmutexlocker.pro
+++ b/tests/auto/corelib/thread/qmutexlocker/qmutexlocker.pro
@@ -1,5 +1,4 @@
-CONFIG += testcase
+CONFIG += testcase parallel_test
 TARGET = tst_qmutexlocker
-SOURCES += tst_qmutexlocker.cpp
 QT = core testlib
-CONFIG += parallel_test
+SOURCES = tst_qmutexlocker.cpp
diff --git a/tests/auto/corelib/thread/qreadlocker/qreadlocker.pro b/tests/auto/corelib/thread/qreadlocker/qreadlocker.pro
index 13cdf0c58b..4cda8d30c1 100644
--- a/tests/auto/corelib/thread/qreadlocker/qreadlocker.pro
+++ b/tests/auto/corelib/thread/qreadlocker/qreadlocker.pro
@@ -1,5 +1,4 @@
-CONFIG += testcase
+CONFIG += testcase parallel_test
 TARGET = tst_qreadlocker
-SOURCES += tst_qreadlocker.cpp
 QT = core testlib
-CONFIG += parallel_test
+SOURCES = tst_qreadlocker.cpp
diff --git a/tests/auto/corelib/thread/qreadwritelock/qreadwritelock.pro b/tests/auto/corelib/thread/qreadwritelock/qreadwritelock.pro
index c35023d46e..59f7d88f1f 100644
--- a/tests/auto/corelib/thread/qreadwritelock/qreadwritelock.pro
+++ b/tests/auto/corelib/thread/qreadwritelock/qreadwritelock.pro
@@ -1,5 +1,4 @@
-CONFIG += testcase
+CONFIG += testcase parallel_test
 TARGET = tst_qreadwritelock
-SOURCES += tst_qreadwritelock.cpp
 QT = core testlib
-CONFIG += parallel_test
+SOURCES = tst_qreadwritelock.cpp
diff --git a/tests/auto/corelib/thread/qsemaphore/qsemaphore.pro b/tests/auto/corelib/thread/qsemaphore/qsemaphore.pro
index 871bd97105..cd87e68848 100644
--- a/tests/auto/corelib/thread/qsemaphore/qsemaphore.pro
+++ b/tests/auto/corelib/thread/qsemaphore/qsemaphore.pro
@@ -1,8 +1,6 @@
-CONFIG += testcase
+CONFIG += testcase parallel_test
 TARGET = tst_qsemaphore
-SOURCES  += tst_qsemaphore.cpp
 QT = core testlib
+SOURCES = tst_qsemaphore.cpp
 
-
-CONFIG += parallel_test
 mac*:CONFIG+=insignificant_test
diff --git a/tests/auto/corelib/thread/qthread/qthread.pro b/tests/auto/corelib/thread/qthread/qthread.pro
index da3be3bf76..cbaf01c14c 100644
--- a/tests/auto/corelib/thread/qthread/qthread.pro
+++ b/tests/auto/corelib/thread/qthread/qthread.pro
@@ -1,5 +1,4 @@
-CONFIG += testcase
+CONFIG += testcase parallel_test
 TARGET = tst_qthread
-SOURCES += tst_qthread.cpp
 QT = core testlib
-CONFIG += parallel_test
+SOURCES = tst_qthread.cpp
diff --git a/tests/auto/corelib/thread/qthreadonce/qthreadonce.pro b/tests/auto/corelib/thread/qthreadonce/qthreadonce.pro
index cd97917165..8fda1b71d7 100644
--- a/tests/auto/corelib/thread/qthreadonce/qthreadonce.pro
+++ b/tests/auto/corelib/thread/qthreadonce/qthreadonce.pro
@@ -1,7 +1,7 @@
-CONFIG += testcase
+CONFIG += testcase parallel_test
 TARGET = tst_qthreadonce
-SOURCES += tst_qthreadonce.cpp
 QT = core testlib
+SOURCES = tst_qthreadonce.cpp
 
 # Don't use gcc's threadsafe statics
 # Note: some versions of gcc generate invalid code with this option...
@@ -10,5 +10,3 @@ QT = core testlib
 
 # Temporary:
 SOURCES += qthreadonce.cpp
-
-CONFIG += parallel_test
diff --git a/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.pro b/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.pro
index 64f176748d..15ced107d3 100644
--- a/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.pro
+++ b/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.pro
@@ -1,4 +1,4 @@
 CONFIG += testcase
 TARGET = tst_qthreadstorage
-SOURCES += tst_qthreadstorage.cpp
 QT = core testlib
+SOURCES = tst_qthreadstorage.cpp
diff --git a/tests/auto/corelib/thread/qwaitcondition/qwaitcondition.pro b/tests/auto/corelib/thread/qwaitcondition/qwaitcondition.pro
index b9cf3af5b3..0fb3b46d4b 100644
--- a/tests/auto/corelib/thread/qwaitcondition/qwaitcondition.pro
+++ b/tests/auto/corelib/thread/qwaitcondition/qwaitcondition.pro
@@ -1,7 +1,4 @@
-CONFIG += testcase
+CONFIG += testcase parallel_test
 TARGET = tst_qwaitcondition
-SOURCES += tst_qwaitcondition.cpp
 QT = core testlib
-
-
-CONFIG += parallel_test
+SOURCES = tst_qwaitcondition.cpp
diff --git a/tests/auto/corelib/thread/qwritelocker/qwritelocker.pro b/tests/auto/corelib/thread/qwritelocker/qwritelocker.pro
index 946e75ca06..31717fdcb6 100644
--- a/tests/auto/corelib/thread/qwritelocker/qwritelocker.pro
+++ b/tests/auto/corelib/thread/qwritelocker/qwritelocker.pro
@@ -1,5 +1,4 @@
-CONFIG += testcase
+CONFIG += testcase parallel_test
 TARGET = tst_qwritelocker
-SOURCES += tst_qwritelocker.cpp
 QT = core testlib
-CONFIG += parallel_test
+SOURCES = tst_qwritelocker.cpp