Moving relevant tests to corelib/tools

Task-number: QTBUG-21066

Change-Id: I650f8f7826b9feea7c1484f06e03e10c68ec2b65
Reviewed-on: http://codereview.qt.nokia.com/3712
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>

147 files changed, 52 insertions, 46 deletions

diff --git a/tests/auto/corelib.pro b/tests/auto/corelib.pro
index 1467db7287..d5b1634307 100644
--- a/tests/auto/corelib.pro
+++ b/tests/auto/corelib.pro
@@ -3,51 +3,9 @@ SUBDIRS=\
    corelib \
    collections \
    exceptionsafety \
-   qbitarray \
-   qbytearray \
-   qbytearraymatcher \
-   qcache \
-   qchar \
-   qcontiguouscache \
-   qcryptographichash \
-   qdate \
-   qdatetime \
-   qeasingcurve \
-   qelapsedtimer \
-   qexplicitlyshareddatapointer \
-   qfreelist \
-   qhash \
-   qline \
-   qmap \
-   qmargins \
    qobjectrace \
-   qpoint \
-   qqueue \
-   qrect \
-   qregexp \
-   qringbuffer \
-   qscopedpointer \
-   qscopedvaluerollback \
-   qset \
-   qsharedpointer \
    qsignalspy \
-   qsize \
-   qsizef \
-   qstl \
-   qstring \
-   qstringbuilder1 \
-   qstringbuilder2 \
-   qstringbuilder3 \
-   qstringbuilder4 \
-   qstringlist \
-   qstringmatcher \
-   qstringref \
-   qtextboundaryfinder \
-   qtime \
-   qtimeline \
    qtmd5 \
    qtokenautomaton \
-   qvarlengtharray \
-   qvector \
    selftests \
    utf8
diff --git a/tests/auto/corelib/corelib.pro b/tests/auto/corelib/corelib.pro
index 62532b968f..9d760792ee 100644
--- a/tests/auto/corelib/corelib.pro
+++ b/tests/auto/corelib/corelib.pro
@@ -8,4 +8,5 @@ SUBDIRS=\
    kernel \
    plugin \
    statemachine \
-   thread
+   thread \
+   tools
diff --git a/tests/auto/qalgorithms/.gitignore b/tests/auto/corelib/tools/qalgorithms/.gitignore
index 379c13eb9b..379c13eb9b 100644
--- a/tests/auto/qalgorithms/.gitignore
+++ b/tests/auto/corelib/tools/qalgorithms/.gitignore
diff --git a/tests/auto/qalgorithms/qalgorithms.pro b/tests/auto/corelib/tools/qalgorithms/qalgorithms.pro
index 9143da658d..9143da658d 100644
--- a/tests/auto/qalgorithms/qalgorithms.pro
+++ b/tests/auto/corelib/tools/qalgorithms/qalgorithms.pro
diff --git a/tests/auto/qalgorithms/tst_qalgorithms.cpp b/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp
index 72e5729ee9..72e5729ee9 100644
--- a/tests/auto/qalgorithms/tst_qalgorithms.cpp
+++ b/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp
diff --git a/tests/auto/qbitarray/.gitignore b/tests/auto/corelib/tools/qbitarray/.gitignore
index a36354a6c4..a36354a6c4 100644
--- a/tests/auto/qbitarray/.gitignore
+++ b/tests/auto/corelib/tools/qbitarray/.gitignore
diff --git a/tests/auto/qbitarray/qbitarray.pro b/tests/auto/corelib/tools/qbitarray/qbitarray.pro
index 358d81bad1..358d81bad1 100644
--- a/tests/auto/qbitarray/qbitarray.pro
+++ b/tests/auto/corelib/tools/qbitarray/qbitarray.pro
diff --git a/tests/auto/qbitarray/tst_qbitarray.cpp b/tests/auto/corelib/tools/qbitarray/tst_qbitarray.cpp
index 83fcfccd21..83fcfccd21 100644
--- a/tests/auto/qbitarray/tst_qbitarray.cpp
+++ b/tests/auto/corelib/tools/qbitarray/tst_qbitarray.cpp
diff --git a/tests/auto/qbytearray/.gitattributes b/tests/auto/corelib/tools/qbytearray/.gitattributes
index e04709aa2e..e04709aa2e 100644
--- a/tests/auto/qbytearray/.gitattributes
+++ b/tests/auto/corelib/tools/qbytearray/.gitattributes
diff --git a/tests/auto/qbytearray/.gitignore b/tests/auto/corelib/tools/qbytearray/.gitignore
index 3de7c3fab5..3de7c3fab5 100644
--- a/tests/auto/qbytearray/.gitignore
+++ b/tests/auto/corelib/tools/qbytearray/.gitignore
diff --git a/tests/auto/qbytearray/qbytearray.pro b/tests/auto/corelib/tools/qbytearray/qbytearray.pro
index 2c58db6b84..2c58db6b84 100644
--- a/tests/auto/qbytearray/qbytearray.pro
+++ b/tests/auto/corelib/tools/qbytearray/qbytearray.pro
diff --git a/tests/auto/qbytearray/rfc3252.txt b/tests/auto/corelib/tools/qbytearray/rfc3252.txt
index b80c61bf0a..b80c61bf0a 100644
--- a/tests/auto/qbytearray/rfc3252.txt
+++ b/tests/auto/corelib/tools/qbytearray/rfc3252.txt
diff --git a/tests/auto/qbytearray/tst_qbytearray.cpp b/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp
index 5f036f37fe..5f036f37fe 100644
--- a/tests/auto/qbytearray/tst_qbytearray.cpp
+++ b/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp
diff --git a/tests/auto/qbytearraymatcher/qbytearraymatcher.pro b/tests/auto/corelib/tools/qbytearraymatcher/qbytearraymatcher.pro
index a2458e623f..a2458e623f 100644
--- a/tests/auto/qbytearraymatcher/qbytearraymatcher.pro
+++ b/tests/auto/corelib/tools/qbytearraymatcher/qbytearraymatcher.pro
diff --git a/tests/auto/qbytearraymatcher/tst_qbytearraymatcher.cpp b/tests/auto/corelib/tools/qbytearraymatcher/tst_qbytearraymatcher.cpp
index 09a3dfdf7d..09a3dfdf7d 100644
--- a/tests/auto/qbytearraymatcher/tst_qbytearraymatcher.cpp
+++ b/tests/auto/corelib/tools/qbytearraymatcher/tst_qbytearraymatcher.cpp
diff --git a/tests/auto/qcache/.gitignore b/tests/auto/corelib/tools/qcache/.gitignore
index 287559b578..287559b578 100644
--- a/tests/auto/qcache/.gitignore
+++ b/tests/auto/corelib/tools/qcache/.gitignore
diff --git a/tests/auto/qcache/qcache.pro b/tests/auto/corelib/tools/qcache/qcache.pro
index 0da4e1414f..0da4e1414f 100644
--- a/tests/auto/qcache/qcache.pro
+++ b/tests/auto/corelib/tools/qcache/qcache.pro
diff --git a/tests/auto/qcache/tst_qcache.cpp b/tests/auto/corelib/tools/qcache/tst_qcache.cpp
index 2c1f256313..2c1f256313 100644
--- a/tests/auto/qcache/tst_qcache.cpp
+++ b/tests/auto/corelib/tools/qcache/tst_qcache.cpp
diff --git a/tests/auto/qchar/.gitignore b/tests/auto/corelib/tools/qchar/.gitignore
index 341b3e6c3f..341b3e6c3f 100644
--- a/tests/auto/qchar/.gitignore
+++ b/tests/auto/corelib/tools/qchar/.gitignore
diff --git a/tests/auto/qchar/NormalizationTest.txt b/tests/auto/corelib/tools/qchar/NormalizationTest.txt
index f36f5a68ce..f36f5a68ce 100644
--- a/tests/auto/qchar/NormalizationTest.txt
+++ b/tests/auto/corelib/tools/qchar/NormalizationTest.txt
diff --git a/tests/auto/qchar/qchar.pro b/tests/auto/corelib/tools/qchar/qchar.pro
index 154c37e1af..154c37e1af 100644
--- a/tests/auto/qchar/qchar.pro
+++ b/tests/auto/corelib/tools/qchar/qchar.pro
diff --git a/tests/auto/qchar/tst_qchar.cpp b/tests/auto/corelib/tools/qchar/tst_qchar.cpp
index 02807f38b3..02807f38b3 100644
--- a/tests/auto/qchar/tst_qchar.cpp
+++ b/tests/auto/corelib/tools/qchar/tst_qchar.cpp
diff --git a/tests/auto/qcontiguouscache/qcontiguouscache.pro b/tests/auto/corelib/tools/qcontiguouscache/qcontiguouscache.pro
index 5951f87f89..5951f87f89 100644
--- a/tests/auto/qcontiguouscache/qcontiguouscache.pro
+++ b/tests/auto/corelib/tools/qcontiguouscache/qcontiguouscache.pro
diff --git a/tests/auto/qcontiguouscache/tst_qcontiguouscache.cpp b/tests/auto/corelib/tools/qcontiguouscache/tst_qcontiguouscache.cpp
index 0a0c999b31..0a0c999b31 100644
--- a/tests/auto/qcontiguouscache/tst_qcontiguouscache.cpp
+++ b/tests/auto/corelib/tools/qcontiguouscache/tst_qcontiguouscache.cpp
diff --git a/tests/auto/qcryptographichash/.gitignore b/tests/auto/corelib/tools/qcryptographichash/.gitignore
index cdc1de2626..cdc1de2626 100644
--- a/tests/auto/qcryptographichash/.gitignore
+++ b/tests/auto/corelib/tools/qcryptographichash/.gitignore
diff --git a/tests/auto/qcryptographichash/qcryptographichash.pro b/tests/auto/corelib/tools/qcryptographichash/qcryptographichash.pro
index 65e31dcb57..65e31dcb57 100644
--- a/tests/auto/qcryptographichash/qcryptographichash.pro
+++ b/tests/auto/corelib/tools/qcryptographichash/qcryptographichash.pro
diff --git a/tests/auto/qcryptographichash/tst_qcryptographichash.cpp b/tests/auto/corelib/tools/qcryptographichash/tst_qcryptographichash.cpp
index b8592e1850..b8592e1850 100644
--- a/tests/auto/qcryptographichash/tst_qcryptographichash.cpp
+++ b/tests/auto/corelib/tools/qcryptographichash/tst_qcryptographichash.cpp
diff --git a/tests/auto/qdate/.gitignore b/tests/auto/corelib/tools/qdate/.gitignore
index 70945d4a86..70945d4a86 100644
--- a/tests/auto/qdate/.gitignore
+++ b/tests/auto/corelib/tools/qdate/.gitignore
diff --git a/tests/auto/qdate/qdate.pro b/tests/auto/corelib/tools/qdate/qdate.pro
index 1c041004d3..1c041004d3 100644
--- a/tests/auto/qdate/qdate.pro
+++ b/tests/auto/corelib/tools/qdate/qdate.pro
diff --git a/tests/auto/qdate/tst_qdate.cpp b/tests/auto/corelib/tools/qdate/tst_qdate.cpp
index b1e0f33ba6..b1e0f33ba6 100644
--- a/tests/auto/qdate/tst_qdate.cpp
+++ b/tests/auto/corelib/tools/qdate/tst_qdate.cpp
diff --git a/tests/auto/qdatetime/.gitignore b/tests/auto/corelib/tools/qdatetime/.gitignore
index 7784f3a3eb..7784f3a3eb 100644
--- a/tests/auto/qdatetime/.gitignore
+++ b/tests/auto/corelib/tools/qdatetime/.gitignore
diff --git a/tests/auto/qdatetime/qdatetime.pro b/tests/auto/corelib/tools/qdatetime/qdatetime.pro
index cd335826ec..cd335826ec 100644
--- a/tests/auto/qdatetime/qdatetime.pro
+++ b/tests/auto/corelib/tools/qdatetime/qdatetime.pro
diff --git a/tests/auto/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
index 95995e857b..95995e857b 100644
--- a/tests/auto/qdatetime/tst_qdatetime.cpp
+++ b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
diff --git a/tests/auto/qeasingcurve/qeasingcurve.pro b/tests/auto/corelib/tools/qeasingcurve/qeasingcurve.pro
index 2a3a075d8a..2a3a075d8a 100644
--- a/tests/auto/qeasingcurve/qeasingcurve.pro
+++ b/tests/auto/corelib/tools/qeasingcurve/qeasingcurve.pro
diff --git a/tests/auto/qeasingcurve/tst_qeasingcurve.cpp b/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp
index 851a9d463c..851a9d463c 100644
--- a/tests/auto/qeasingcurve/tst_qeasingcurve.cpp
+++ b/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp
diff --git a/tests/auto/qelapsedtimer/qelapsedtimer.pro b/tests/auto/corelib/tools/qelapsedtimer/qelapsedtimer.pro
index 876887678f..876887678f 100644
--- a/tests/auto/qelapsedtimer/qelapsedtimer.pro
+++ b/tests/auto/corelib/tools/qelapsedtimer/qelapsedtimer.pro
diff --git a/tests/auto/qelapsedtimer/tst_qelapsedtimer.cpp b/tests/auto/corelib/tools/qelapsedtimer/tst_qelapsedtimer.cpp
index 40b2d30c02..40b2d30c02 100644
--- a/tests/auto/qelapsedtimer/tst_qelapsedtimer.cpp
+++ b/tests/auto/corelib/tools/qelapsedtimer/tst_qelapsedtimer.cpp
diff --git a/tests/auto/qexplicitlyshareddatapointer/.gitignore b/tests/auto/corelib/tools/qexplicitlyshareddatapointer/.gitignore
index 47e152c120..47e152c120 100644
--- a/tests/auto/qexplicitlyshareddatapointer/.gitignore
+++ b/tests/auto/corelib/tools/qexplicitlyshareddatapointer/.gitignore
diff --git a/tests/auto/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro b/tests/auto/corelib/tools/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro
index cf574ffc40..cf574ffc40 100644
--- a/tests/auto/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro
+++ b/tests/auto/corelib/tools/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro
diff --git a/tests/auto/qexplicitlyshareddatapointer/tst_qexplicitlyshareddatapointer.cpp b/tests/auto/corelib/tools/qexplicitlyshareddatapointer/tst_qexplicitlyshareddatapointer.cpp
index a6c2f50e6d..a6c2f50e6d 100644
--- a/tests/auto/qexplicitlyshareddatapointer/tst_qexplicitlyshareddatapointer.cpp
+++ b/tests/auto/corelib/tools/qexplicitlyshareddatapointer/tst_qexplicitlyshareddatapointer.cpp
diff --git a/tests/auto/qfreelist/qfreelist.pro b/tests/auto/corelib/tools/qfreelist/qfreelist.pro
index 0afa12b8a8..0afa12b8a8 100644
--- a/tests/auto/qfreelist/qfreelist.pro
+++ b/tests/auto/corelib/tools/qfreelist/qfreelist.pro
diff --git a/tests/auto/qfreelist/tst_qfreelist.cpp b/tests/auto/corelib/tools/qfreelist/tst_qfreelist.cpp
index 139d76e64a..139d76e64a 100644
--- a/tests/auto/qfreelist/tst_qfreelist.cpp
+++ b/tests/auto/corelib/tools/qfreelist/tst_qfreelist.cpp
diff --git a/tests/auto/qhash/.gitignore b/tests/auto/corelib/tools/qhash/.gitignore
index 4c54a69b3a..4c54a69b3a 100644
--- a/tests/auto/qhash/.gitignore
+++ b/tests/auto/corelib/tools/qhash/.gitignore
diff --git a/tests/auto/qhash/qhash.pro b/tests/auto/corelib/tools/qhash/qhash.pro
index 16c9eabecc..16c9eabecc 100644
--- a/tests/auto/qhash/qhash.pro
+++ b/tests/auto/corelib/tools/qhash/qhash.pro
diff --git a/tests/auto/qhash/tst_qhash.cpp b/tests/auto/corelib/tools/qhash/tst_qhash.cpp
index 18654cf763..18654cf763 100644
--- a/tests/auto/qhash/tst_qhash.cpp
+++ b/tests/auto/corelib/tools/qhash/tst_qhash.cpp
diff --git a/tests/auto/qline/.gitignore b/tests/auto/corelib/tools/qline/.gitignore
index 5f1f39d4bf..5f1f39d4bf 100644
--- a/tests/auto/qline/.gitignore
+++ b/tests/auto/corelib/tools/qline/.gitignore
diff --git a/tests/auto/qline/qline.pro b/tests/auto/corelib/tools/qline/qline.pro
index 6e9af24476..6e9af24476 100644
--- a/tests/auto/qline/qline.pro
+++ b/tests/auto/corelib/tools/qline/qline.pro
diff --git a/tests/auto/qline/tst_qline.cpp b/tests/auto/corelib/tools/qline/tst_qline.cpp
index de47506ae3..de47506ae3 100644
--- a/tests/auto/qline/tst_qline.cpp
+++ b/tests/auto/corelib/tools/qline/tst_qline.cpp
diff --git a/tests/auto/qlist/.gitignore b/tests/auto/corelib/tools/qlist/.gitignore
index df208b6e78..df208b6e78 100644
--- a/tests/auto/qlist/.gitignore
+++ b/tests/auto/corelib/tools/qlist/.gitignore
diff --git a/tests/auto/qlist/qlist.pro b/tests/auto/corelib/tools/qlist/qlist.pro
index be599b7b85..be599b7b85 100644
--- a/tests/auto/qlist/qlist.pro
+++ b/tests/auto/corelib/tools/qlist/qlist.pro
diff --git a/tests/auto/qlist/tst_qlist.cpp b/tests/auto/corelib/tools/qlist/tst_qlist.cpp
index 3901b6ffe8..3901b6ffe8 100644
--- a/tests/auto/qlist/tst_qlist.cpp
+++ b/tests/auto/corelib/tools/qlist/tst_qlist.cpp
diff --git a/tests/auto/qlocale/.gitignore b/tests/auto/corelib/tools/qlocale/.gitignore
index 21ab80a2af..21ab80a2af 100644
--- a/tests/auto/qlocale/.gitignore
+++ b/tests/auto/corelib/tools/qlocale/.gitignore
diff --git a/tests/auto/qlocale/qlocale.pro b/tests/auto/corelib/tools/qlocale/qlocale.pro
index 4c4a31e0de..4c4a31e0de 100644
--- a/tests/auto/qlocale/qlocale.pro
+++ b/tests/auto/corelib/tools/qlocale/qlocale.pro
diff --git a/tests/auto/qlocale/syslocaleapp/syslocaleapp.cpp b/tests/auto/corelib/tools/qlocale/syslocaleapp/syslocaleapp.cpp
index 030fc4a728..030fc4a728 100644
--- a/tests/auto/qlocale/syslocaleapp/syslocaleapp.cpp
+++ b/tests/auto/corelib/tools/qlocale/syslocaleapp/syslocaleapp.cpp
diff --git a/tests/auto/qlocale/syslocaleapp/syslocaleapp.pro b/tests/auto/corelib/tools/qlocale/syslocaleapp/syslocaleapp.pro
index d3188c020d..d3188c020d 100644
--- a/tests/auto/qlocale/syslocaleapp/syslocaleapp.pro
+++ b/tests/auto/corelib/tools/qlocale/syslocaleapp/syslocaleapp.pro
diff --git a/tests/auto/qlocale/test/test.pro b/tests/auto/corelib/tools/qlocale/test/test.pro
index 8117708c46..8117708c46 100644
--- a/tests/auto/qlocale/test/test.pro
+++ b/tests/auto/corelib/tools/qlocale/test/test.pro
diff --git a/tests/auto/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
index b9e5fd93e1..b9e5fd93e1 100644
--- a/tests/auto/qlocale/tst_qlocale.cpp
+++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
diff --git a/tests/auto/qmap/.gitignore b/tests/auto/corelib/tools/qmap/.gitignore
index e94a75d242..e94a75d242 100644
--- a/tests/auto/qmap/.gitignore
+++ b/tests/auto/corelib/tools/qmap/.gitignore
diff --git a/tests/auto/qmap/qmap.pro b/tests/auto/corelib/tools/qmap/qmap.pro
index eaed926481..eaed926481 100644
--- a/tests/auto/qmap/qmap.pro
+++ b/tests/auto/corelib/tools/qmap/qmap.pro
diff --git a/tests/auto/qmap/tst_qmap.cpp b/tests/auto/corelib/tools/qmap/tst_qmap.cpp
index 141e693b16..141e693b16 100644
--- a/tests/auto/qmap/tst_qmap.cpp
+++ b/tests/auto/corelib/tools/qmap/tst_qmap.cpp
diff --git a/tests/auto/qmargins/qmargins.pro b/tests/auto/corelib/tools/qmargins/qmargins.pro
index 0404da0424..0404da0424 100644
--- a/tests/auto/qmargins/qmargins.pro
+++ b/tests/auto/corelib/tools/qmargins/qmargins.pro
diff --git a/tests/auto/qmargins/tst_qmargins.cpp b/tests/auto/corelib/tools/qmargins/tst_qmargins.cpp
index c7632d125a..c7632d125a 100644
--- a/tests/auto/qmargins/tst_qmargins.cpp
+++ b/tests/auto/corelib/tools/qmargins/tst_qmargins.cpp
diff --git a/tests/auto/qpoint/.gitignore b/tests/auto/corelib/tools/qpoint/.gitignore
index c8711ed354..c8711ed354 100644
--- a/tests/auto/qpoint/.gitignore
+++ b/tests/auto/corelib/tools/qpoint/.gitignore
diff --git a/tests/auto/qpoint/qpoint.pro b/tests/auto/corelib/tools/qpoint/qpoint.pro
index fd240461e2..fd240461e2 100644
--- a/tests/auto/qpoint/qpoint.pro
+++ b/tests/auto/corelib/tools/qpoint/qpoint.pro
diff --git a/tests/auto/qpoint/tst_qpoint.cpp b/tests/auto/corelib/tools/qpoint/tst_qpoint.cpp
index c4b5339a3b..c4b5339a3b 100644
--- a/tests/auto/qpoint/tst_qpoint.cpp
+++ b/tests/auto/corelib/tools/qpoint/tst_qpoint.cpp
diff --git a/tests/auto/qqueue/.gitignore b/tests/auto/corelib/tools/qqueue/.gitignore
index 706f21fa7a..706f21fa7a 100644
--- a/tests/auto/qqueue/.gitignore
+++ b/tests/auto/corelib/tools/qqueue/.gitignore
diff --git a/tests/auto/qqueue/qqueue.pro b/tests/auto/corelib/tools/qqueue/qqueue.pro
index ce0d8c30ca..ce0d8c30ca 100644
--- a/tests/auto/qqueue/qqueue.pro
+++ b/tests/auto/corelib/tools/qqueue/qqueue.pro
diff --git a/tests/auto/qqueue/tst_qqueue.cpp b/tests/auto/corelib/tools/qqueue/tst_qqueue.cpp
index 483cf93918..483cf93918 100644
--- a/tests/auto/qqueue/tst_qqueue.cpp
+++ b/tests/auto/corelib/tools/qqueue/tst_qqueue.cpp
diff --git a/tests/auto/qrect/.gitignore b/tests/auto/corelib/tools/qrect/.gitignore
index 95866b6fbd..95866b6fbd 100644
--- a/tests/auto/qrect/.gitignore
+++ b/tests/auto/corelib/tools/qrect/.gitignore
diff --git a/tests/auto/qrect/qrect.pro b/tests/auto/corelib/tools/qrect/qrect.pro
index f1ad046e34..f1ad046e34 100644
--- a/tests/auto/qrect/qrect.pro
+++ b/tests/auto/corelib/tools/qrect/qrect.pro
diff --git a/tests/auto/qrect/tst_qrect.cpp b/tests/auto/corelib/tools/qrect/tst_qrect.cpp
index c84e175857..c84e175857 100644
--- a/tests/auto/qrect/tst_qrect.cpp
+++ b/tests/auto/corelib/tools/qrect/tst_qrect.cpp
diff --git a/tests/auto/qregexp/.gitignore b/tests/auto/corelib/tools/qregexp/.gitignore
index e6e629ee2c..e6e629ee2c 100644
--- a/tests/auto/qregexp/.gitignore
+++ b/tests/auto/corelib/tools/qregexp/.gitignore
diff --git a/tests/auto/qregexp/qregexp.pro b/tests/auto/corelib/tools/qregexp/qregexp.pro
index e0fef12479..e0fef12479 100644
--- a/tests/auto/qregexp/qregexp.pro
+++ b/tests/auto/corelib/tools/qregexp/qregexp.pro
diff --git a/tests/auto/qregexp/tst_qregexp.cpp b/tests/auto/corelib/tools/qregexp/tst_qregexp.cpp
index 65edb56410..65edb56410 100644
--- a/tests/auto/qregexp/tst_qregexp.cpp
+++ b/tests/auto/corelib/tools/qregexp/tst_qregexp.cpp
diff --git a/tests/auto/qringbuffer/qringbuffer.pro b/tests/auto/corelib/tools/qringbuffer/qringbuffer.pro
index dc572d0633..dc572d0633 100644
--- a/tests/auto/qringbuffer/qringbuffer.pro
+++ b/tests/auto/corelib/tools/qringbuffer/qringbuffer.pro
diff --git a/tests/auto/qringbuffer/tst_qringbuffer.cpp b/tests/auto/corelib/tools/qringbuffer/tst_qringbuffer.cpp
index 0ca360fda7..0ca360fda7 100644
--- a/tests/auto/qringbuffer/tst_qringbuffer.cpp
+++ b/tests/auto/corelib/tools/qringbuffer/tst_qringbuffer.cpp
diff --git a/tests/auto/qscopedpointer/.gitignore b/tests/auto/corelib/tools/qscopedpointer/.gitignore
index 9f2324cb11..9f2324cb11 100644
--- a/tests/auto/qscopedpointer/.gitignore
+++ b/tests/auto/corelib/tools/qscopedpointer/.gitignore
diff --git a/tests/auto/qscopedpointer/qscopedpointer.pro b/tests/auto/corelib/tools/qscopedpointer/qscopedpointer.pro
index 4a3d5b8de8..4a3d5b8de8 100644
--- a/tests/auto/qscopedpointer/qscopedpointer.pro
+++ b/tests/auto/corelib/tools/qscopedpointer/qscopedpointer.pro
diff --git a/tests/auto/qscopedpointer/tst_qscopedpointer.cpp b/tests/auto/corelib/tools/qscopedpointer/tst_qscopedpointer.cpp
index 06c0ecbafd..06c0ecbafd 100644
--- a/tests/auto/qscopedpointer/tst_qscopedpointer.cpp
+++ b/tests/auto/corelib/tools/qscopedpointer/tst_qscopedpointer.cpp
diff --git a/tests/auto/qscopedvaluerollback/qscopedvaluerollback.pro b/tests/auto/corelib/tools/qscopedvaluerollback/qscopedvaluerollback.pro
index f06e21ba1f..f06e21ba1f 100644
--- a/tests/auto/qscopedvaluerollback/qscopedvaluerollback.pro
+++ b/tests/auto/corelib/tools/qscopedvaluerollback/qscopedvaluerollback.pro
diff --git a/tests/auto/qscopedvaluerollback/tst_qscopedvaluerollback.cpp b/tests/auto/corelib/tools/qscopedvaluerollback/tst_qscopedvaluerollback.cpp
index 457733b7a8..457733b7a8 100644
--- a/tests/auto/qscopedvaluerollback/tst_qscopedvaluerollback.cpp
+++ b/tests/auto/corelib/tools/qscopedvaluerollback/tst_qscopedvaluerollback.cpp
diff --git a/tests/auto/qset/.gitignore b/tests/auto/corelib/tools/qset/.gitignore
index 43440e53f3..43440e53f3 100644
--- a/tests/auto/qset/.gitignore
+++ b/tests/auto/corelib/tools/qset/.gitignore
diff --git a/tests/auto/qset/qset.pro b/tests/auto/corelib/tools/qset/qset.pro
index ebdf0d68f0..ebdf0d68f0 100644
--- a/tests/auto/qset/qset.pro
+++ b/tests/auto/corelib/tools/qset/qset.pro
diff --git a/tests/auto/qset/tst_qset.cpp b/tests/auto/corelib/tools/qset/tst_qset.cpp
index 5611709075..5611709075 100644
--- a/tests/auto/qset/tst_qset.cpp
+++ b/tests/auto/corelib/tools/qset/tst_qset.cpp
diff --git a/tests/auto/qsharedpointer/.gitignore b/tests/auto/corelib/tools/qsharedpointer/.gitignore
index 3cd9f1a085..3cd9f1a085 100644
--- a/tests/auto/qsharedpointer/.gitignore
+++ b/tests/auto/corelib/tools/qsharedpointer/.gitignore
diff --git a/tests/auto/qsharedpointer/externaltests.cpp b/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp
index 1bfa1c10a0..1bfa1c10a0 100644
--- a/tests/auto/qsharedpointer/externaltests.cpp
+++ b/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp
diff --git a/tests/auto/qsharedpointer/externaltests.h b/tests/auto/corelib/tools/qsharedpointer/externaltests.h
index e07ba31928..e07ba31928 100644
--- a/tests/auto/qsharedpointer/externaltests.h
+++ b/tests/auto/corelib/tools/qsharedpointer/externaltests.h
diff --git a/tests/auto/qsharedpointer/externaltests.pri b/tests/auto/corelib/tools/qsharedpointer/externaltests.pri
index c8a36765ea..c8a36765ea 100644
--- a/tests/auto/qsharedpointer/externaltests.pri
+++ b/tests/auto/corelib/tools/qsharedpointer/externaltests.pri
diff --git a/tests/auto/qsharedpointer/forwarddeclaration.cpp b/tests/auto/corelib/tools/qsharedpointer/forwarddeclaration.cpp
index f6ee9ad02a..f6ee9ad02a 100644
--- a/tests/auto/qsharedpointer/forwarddeclaration.cpp
+++ b/tests/auto/corelib/tools/qsharedpointer/forwarddeclaration.cpp
diff --git a/tests/auto/qsharedpointer/forwarddeclared.cpp b/tests/auto/corelib/tools/qsharedpointer/forwarddeclared.cpp
index 5ff8893b81..5ff8893b81 100644
--- a/tests/auto/qsharedpointer/forwarddeclared.cpp
+++ b/tests/auto/corelib/tools/qsharedpointer/forwarddeclared.cpp
diff --git a/tests/auto/qsharedpointer/forwarddeclared.h b/tests/auto/corelib/tools/qsharedpointer/forwarddeclared.h
index 6afc293dde..6afc293dde 100644
--- a/tests/auto/qsharedpointer/forwarddeclared.h
+++ b/tests/auto/corelib/tools/qsharedpointer/forwarddeclared.h
diff --git a/tests/auto/qsharedpointer/qsharedpointer.pro b/tests/auto/corelib/tools/qsharedpointer/qsharedpointer.pro
index 014006e782..014006e782 100644
--- a/tests/auto/qsharedpointer/qsharedpointer.pro
+++ b/tests/auto/corelib/tools/qsharedpointer/qsharedpointer.pro
diff --git a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
index 27d2d4d24a..27d2d4d24a 100644
--- a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
+++ b/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
diff --git a/tests/auto/qsharedpointer/wrapper.cpp b/tests/auto/corelib/tools/qsharedpointer/wrapper.cpp
index 018fc1c97b..018fc1c97b 100644
--- a/tests/auto/qsharedpointer/wrapper.cpp
+++ b/tests/auto/corelib/tools/qsharedpointer/wrapper.cpp
diff --git a/tests/auto/qsharedpointer/wrapper.h b/tests/auto/corelib/tools/qsharedpointer/wrapper.h
index b25510f76d..b25510f76d 100644
--- a/tests/auto/qsharedpointer/wrapper.h
+++ b/tests/auto/corelib/tools/qsharedpointer/wrapper.h
diff --git a/tests/auto/qsize/.gitignore b/tests/auto/corelib/tools/qsize/.gitignore
index 748ce461c8..748ce461c8 100644
--- a/tests/auto/qsize/.gitignore
+++ b/tests/auto/corelib/tools/qsize/.gitignore
diff --git a/tests/auto/qsize/qsize.pro b/tests/auto/corelib/tools/qsize/qsize.pro
index a1814ac8c5..a1814ac8c5 100644
--- a/tests/auto/qsize/qsize.pro
+++ b/tests/auto/corelib/tools/qsize/qsize.pro
diff --git a/tests/auto/qsize/tst_qsize.cpp b/tests/auto/corelib/tools/qsize/tst_qsize.cpp
index 36654df618..36654df618 100644
--- a/tests/auto/qsize/tst_qsize.cpp
+++ b/tests/auto/corelib/tools/qsize/tst_qsize.cpp
diff --git a/tests/auto/qsizef/.gitignore b/tests/auto/corelib/tools/qsizef/.gitignore
index f4ded487d7..f4ded487d7 100644
--- a/tests/auto/qsizef/.gitignore
+++ b/tests/auto/corelib/tools/qsizef/.gitignore
diff --git a/tests/auto/qsizef/qsizef.pro b/tests/auto/corelib/tools/qsizef/qsizef.pro
index 5aa07d72a1..5aa07d72a1 100644
--- a/tests/auto/qsizef/qsizef.pro
+++ b/tests/auto/corelib/tools/qsizef/qsizef.pro
diff --git a/tests/auto/qsizef/tst_qsizef.cpp b/tests/auto/corelib/tools/qsizef/tst_qsizef.cpp
index 2e03a65197..2e03a65197 100644
--- a/tests/auto/qsizef/tst_qsizef.cpp
+++ b/tests/auto/corelib/tools/qsizef/tst_qsizef.cpp
diff --git a/tests/auto/qstl/.gitignore b/tests/auto/corelib/tools/qstl/.gitignore
index 6e6a885f4f..6e6a885f4f 100644
--- a/tests/auto/qstl/.gitignore
+++ b/tests/auto/corelib/tools/qstl/.gitignore
diff --git a/tests/auto/qstl/qstl.pro b/tests/auto/corelib/tools/qstl/qstl.pro
index a0c9db1dfc..a0c9db1dfc 100644
--- a/tests/auto/qstl/qstl.pro
+++ b/tests/auto/corelib/tools/qstl/qstl.pro
diff --git a/tests/auto/qstl/tst_qstl.cpp b/tests/auto/corelib/tools/qstl/tst_qstl.cpp
index 43c318737f..43c318737f 100644
--- a/tests/auto/qstl/tst_qstl.cpp
+++ b/tests/auto/corelib/tools/qstl/tst_qstl.cpp
diff --git a/tests/auto/qstring/.gitignore b/tests/auto/corelib/tools/qstring/.gitignore
index c2ea8d0336..c2ea8d0336 100644
--- a/tests/auto/qstring/.gitignore
+++ b/tests/auto/corelib/tools/qstring/.gitignore
diff --git a/tests/auto/qstring/double_data.h b/tests/auto/corelib/tools/qstring/double_data.h
index e7e654c442..e7e654c442 100644
--- a/tests/auto/qstring/double_data.h
+++ b/tests/auto/corelib/tools/qstring/double_data.h
diff --git a/tests/auto/qstring/qstring.pro b/tests/auto/corelib/tools/qstring/qstring.pro
index 1c123adcca..1c123adcca 100644
--- a/tests/auto/qstring/qstring.pro
+++ b/tests/auto/corelib/tools/qstring/qstring.pro
diff --git a/tests/auto/qstring/tst_qstring.cpp b/tests/auto/corelib/tools/qstring/tst_qstring.cpp
index 256bbcf4fc..256bbcf4fc 100644
--- a/tests/auto/qstring/tst_qstring.cpp
+++ b/tests/auto/corelib/tools/qstring/tst_qstring.cpp
diff --git a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder.pro b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder.pro
new file mode 100644
index 0000000000..d73d541502
--- /dev/null
+++ b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder.pro
@@ -0,0 +1,6 @@
+TEMPLATE=subdirs
+SUBDIRS= \
+   qstringbuilder1 \
+   qstringbuilder2 \
+   qstringbuilder3 \
+   qstringbuilder4
diff --git a/tests/auto/qstringbuilder1/qstringbuilder1.pro b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/qstringbuilder1.pro
index dc9062f4da..dc9062f4da 100644
--- a/tests/auto/qstringbuilder1/qstringbuilder1.pro
+++ b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/qstringbuilder1.pro
diff --git a/tests/auto/qstringbuilder1/stringbuilder.cpp b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/stringbuilder.cpp
index 4d453b0585..4d453b0585 100644
--- a/tests/auto/qstringbuilder1/stringbuilder.cpp
+++ b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/stringbuilder.cpp
diff --git a/tests/auto/qstringbuilder1/tst_qstringbuilder1.cpp b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/tst_qstringbuilder1.cpp
index 134da1d877..134da1d877 100644
--- a/tests/auto/qstringbuilder1/tst_qstringbuilder1.cpp
+++ b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/tst_qstringbuilder1.cpp
diff --git a/tests/auto/qstringbuilder2/qstringbuilder2.pro b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder2/qstringbuilder2.pro
index a57c6f19f2..a57c6f19f2 100644
--- a/tests/auto/qstringbuilder2/qstringbuilder2.pro
+++ b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder2/qstringbuilder2.pro
diff --git a/tests/auto/qstringbuilder2/tst_qstringbuilder2.cpp b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder2/tst_qstringbuilder2.cpp
index b74cea069d..b74cea069d 100644
--- a/tests/auto/qstringbuilder2/tst_qstringbuilder2.cpp
+++ b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder2/tst_qstringbuilder2.cpp
diff --git a/tests/auto/qstringbuilder3/qstringbuilder3.pro b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder3/qstringbuilder3.pro
index 5aced7c258..5aced7c258 100644
--- a/tests/auto/qstringbuilder3/qstringbuilder3.pro
+++ b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder3/qstringbuilder3.pro
diff --git a/tests/auto/qstringbuilder3/tst_qstringbuilder3.cpp b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder3/tst_qstringbuilder3.cpp
index 0320ed293d..0320ed293d 100644
--- a/tests/auto/qstringbuilder3/tst_qstringbuilder3.cpp
+++ b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder3/tst_qstringbuilder3.cpp
diff --git a/tests/auto/qstringbuilder4/qstringbuilder4.pro b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder4/qstringbuilder4.pro
index 0532a9b925..0532a9b925 100644
--- a/tests/auto/qstringbuilder4/qstringbuilder4.pro
+++ b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder4/qstringbuilder4.pro
diff --git a/tests/auto/qstringbuilder4/tst_qstringbuilder4.cpp b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder4/tst_qstringbuilder4.cpp
index 7013780789..7013780789 100644
--- a/tests/auto/qstringbuilder4/tst_qstringbuilder4.cpp
+++ b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder4/tst_qstringbuilder4.cpp
diff --git a/tests/auto/qstringlist/.gitignore b/tests/auto/corelib/tools/qstringlist/.gitignore
index 3e0cdc952f..3e0cdc952f 100644
--- a/tests/auto/qstringlist/.gitignore
+++ b/tests/auto/corelib/tools/qstringlist/.gitignore
diff --git a/tests/auto/qstringlist/qstringlist.pro b/tests/auto/corelib/tools/qstringlist/qstringlist.pro
index d82a3487fd..d82a3487fd 100644
--- a/tests/auto/qstringlist/qstringlist.pro
+++ b/tests/auto/corelib/tools/qstringlist/qstringlist.pro
diff --git a/tests/auto/qstringlist/tst_qstringlist.cpp b/tests/auto/corelib/tools/qstringlist/tst_qstringlist.cpp
index 3342ec0d79..3342ec0d79 100644
--- a/tests/auto/qstringlist/tst_qstringlist.cpp
+++ b/tests/auto/corelib/tools/qstringlist/tst_qstringlist.cpp
diff --git a/tests/auto/qstringmatcher/.gitignore b/tests/auto/corelib/tools/qstringmatcher/.gitignore
index 3c7caf8490..3c7caf8490 100644
--- a/tests/auto/qstringmatcher/.gitignore
+++ b/tests/auto/corelib/tools/qstringmatcher/.gitignore
diff --git a/tests/auto/qstringmatcher/qstringmatcher.pro b/tests/auto/corelib/tools/qstringmatcher/qstringmatcher.pro
index c5249ec84a..c5249ec84a 100644
--- a/tests/auto/qstringmatcher/qstringmatcher.pro
+++ b/tests/auto/corelib/tools/qstringmatcher/qstringmatcher.pro
diff --git a/tests/auto/qstringmatcher/tst_qstringmatcher.cpp b/tests/auto/corelib/tools/qstringmatcher/tst_qstringmatcher.cpp
index 9dade954f8..9dade954f8 100644
--- a/tests/auto/qstringmatcher/tst_qstringmatcher.cpp
+++ b/tests/auto/corelib/tools/qstringmatcher/tst_qstringmatcher.cpp
diff --git a/tests/auto/qstringref/qstringref.pro b/tests/auto/corelib/tools/qstringref/qstringref.pro
index 34f2de46ae..34f2de46ae 100644
--- a/tests/auto/qstringref/qstringref.pro
+++ b/tests/auto/corelib/tools/qstringref/qstringref.pro
diff --git a/tests/auto/qstringref/tst_qstringref.cpp b/tests/auto/corelib/tools/qstringref/tst_qstringref.cpp
index dbf8ee73fc..dbf8ee73fc 100644
--- a/tests/auto/qstringref/tst_qstringref.cpp
+++ b/tests/auto/corelib/tools/qstringref/tst_qstringref.cpp
diff --git a/tests/auto/qtextboundaryfinder/.gitignore b/tests/auto/corelib/tools/qtextboundaryfinder/.gitignore
index bd0df58233..bd0df58233 100644
--- a/tests/auto/qtextboundaryfinder/.gitignore
+++ b/tests/auto/corelib/tools/qtextboundaryfinder/.gitignore
diff --git a/tests/auto/qtextboundaryfinder/data/GraphemeBreakTest.txt b/tests/auto/corelib/tools/qtextboundaryfinder/data/GraphemeBreakTest.txt
index 69096e1065..69096e1065 100644
--- a/tests/auto/qtextboundaryfinder/data/GraphemeBreakTest.txt
+++ b/tests/auto/corelib/tools/qtextboundaryfinder/data/GraphemeBreakTest.txt
diff --git a/tests/auto/qtextboundaryfinder/data/SentenceBreakTest.txt b/tests/auto/corelib/tools/qtextboundaryfinder/data/SentenceBreakTest.txt
index 431d0e6a36..431d0e6a36 100644
--- a/tests/auto/qtextboundaryfinder/data/SentenceBreakTest.txt
+++ b/tests/auto/corelib/tools/qtextboundaryfinder/data/SentenceBreakTest.txt
diff --git a/tests/auto/qtextboundaryfinder/data/WordBreakTest.txt b/tests/auto/corelib/tools/qtextboundaryfinder/data/WordBreakTest.txt
index 2ece4560d7..2ece4560d7 100644
--- a/tests/auto/qtextboundaryfinder/data/WordBreakTest.txt
+++ b/tests/auto/corelib/tools/qtextboundaryfinder/data/WordBreakTest.txt
diff --git a/tests/auto/qtextboundaryfinder/qtextboundaryfinder.pro b/tests/auto/corelib/tools/qtextboundaryfinder/qtextboundaryfinder.pro
index 5f3cb119f4..5f3cb119f4 100644
--- a/tests/auto/qtextboundaryfinder/qtextboundaryfinder.pro
+++ b/tests/auto/corelib/tools/qtextboundaryfinder/qtextboundaryfinder.pro
diff --git a/tests/auto/qtextboundaryfinder/tst_qtextboundaryfinder.cpp b/tests/auto/corelib/tools/qtextboundaryfinder/tst_qtextboundaryfinder.cpp
index 3657556189..3657556189 100644
--- a/tests/auto/qtextboundaryfinder/tst_qtextboundaryfinder.cpp
+++ b/tests/auto/corelib/tools/qtextboundaryfinder/tst_qtextboundaryfinder.cpp
diff --git a/tests/auto/qtime/.gitignore b/tests/auto/corelib/tools/qtime/.gitignore
index 26a4c65cc2..26a4c65cc2 100644
--- a/tests/auto/qtime/.gitignore
+++ b/tests/auto/corelib/tools/qtime/.gitignore
diff --git a/tests/auto/qtime/qtime.pro b/tests/auto/corelib/tools/qtime/qtime.pro
index ce4f7ae91f..ce4f7ae91f 100644
--- a/tests/auto/qtime/qtime.pro
+++ b/tests/auto/corelib/tools/qtime/qtime.pro
diff --git a/tests/auto/qtime/tst_qtime.cpp b/tests/auto/corelib/tools/qtime/tst_qtime.cpp
index 746f36d6d9..746f36d6d9 100644
--- a/tests/auto/qtime/tst_qtime.cpp
+++ b/tests/auto/corelib/tools/qtime/tst_qtime.cpp
diff --git a/tests/auto/qtimeline/.gitignore b/tests/auto/corelib/tools/qtimeline/.gitignore
index fa0e347d80..fa0e347d80 100644
--- a/tests/auto/qtimeline/.gitignore
+++ b/tests/auto/corelib/tools/qtimeline/.gitignore
diff --git a/tests/auto/qtimeline/qtimeline.pro b/tests/auto/corelib/tools/qtimeline/qtimeline.pro
index 9be717dba8..9be717dba8 100644
--- a/tests/auto/qtimeline/qtimeline.pro
+++ b/tests/auto/corelib/tools/qtimeline/qtimeline.pro
diff --git a/tests/auto/qtimeline/tst_qtimeline.cpp b/tests/auto/corelib/tools/qtimeline/tst_qtimeline.cpp
index 176688b809..176688b809 100644
--- a/tests/auto/qtimeline/tst_qtimeline.cpp
+++ b/tests/auto/corelib/tools/qtimeline/tst_qtimeline.cpp
diff --git a/tests/auto/qvarlengtharray/.gitignore b/tests/auto/corelib/tools/qvarlengtharray/.gitignore
index d085e835c7..d085e835c7 100644
--- a/tests/auto/qvarlengtharray/.gitignore
+++ b/tests/auto/corelib/tools/qvarlengtharray/.gitignore
diff --git a/tests/auto/qvarlengtharray/qvarlengtharray.pro b/tests/auto/corelib/tools/qvarlengtharray/qvarlengtharray.pro
index 183da1b938..183da1b938 100644
--- a/tests/auto/qvarlengtharray/qvarlengtharray.pro
+++ b/tests/auto/corelib/tools/qvarlengtharray/qvarlengtharray.pro
diff --git a/tests/auto/qvarlengtharray/tst_qvarlengtharray.cpp b/tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp
index fd67758cb6..fd67758cb6 100644
--- a/tests/auto/qvarlengtharray/tst_qvarlengtharray.cpp
+++ b/tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp
diff --git a/tests/auto/qvector/.gitignore b/tests/auto/corelib/tools/qvector/.gitignore
index 5520039486..5520039486 100644
--- a/tests/auto/qvector/.gitignore
+++ b/tests/auto/corelib/tools/qvector/.gitignore
diff --git a/tests/auto/qvector/qvector.pro b/tests/auto/corelib/tools/qvector/qvector.pro
index a7c3957f2c..a7c3957f2c 100644
--- a/tests/auto/qvector/qvector.pro
+++ b/tests/auto/corelib/tools/qvector/qvector.pro
diff --git a/tests/auto/qvector/tst_qvector.cpp b/tests/auto/corelib/tools/qvector/tst_qvector.cpp
index 4cc2bc481a..4cc2bc481a 100644
--- a/tests/auto/qvector/tst_qvector.cpp
+++ b/tests/auto/corelib/tools/qvector/tst_qvector.cpp
diff --git a/tests/auto/corelib/tools/tools.pro b/tests/auto/corelib/tools/tools.pro
new file mode 100644
index 0000000000..930799e3b3
--- /dev/null
+++ b/tests/auto/corelib/tools/tools.pro
@@ -0,0 +1,44 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+    qalgorithms \
+    qbitarray \
+    qbytearray \
+    qbytearraymatcher \
+    qcache \
+    qchar \
+    qcontiguouscache \
+    qcryptographichash \
+    qdate \
+    qdatetime \
+    qeasingcurve \
+    qelapsedtimer \
+    qexplicitlyshareddatapointer \
+    qfreelist \
+    qhash \
+    qline \
+    qlist \
+    qlocale \
+    qmap \
+    qmargins \
+    qpoint \
+    qqueue \
+    qrect \
+    qregexp \
+    qringbuffer \
+    qscopedpointer \
+    qscopedvaluerollback \
+    qset \
+    qsharedpointer \
+    qsize \
+    qsizef \
+    qstl \
+    qstring \
+    qstringbuilder \
+    qstringlist \
+    qstringmatcher \
+    qstringref \
+    qtextboundaryfinder \
+    qtime \
+    qtimeline \
+    qvarlengtharray \
+    qvector
diff --git a/tests/auto/gui.pro b/tests/auto/gui.pro
index 047f30fd38..9305a6eb55 100644
--- a/tests/auto/gui.pro
+++ b/tests/auto/gui.pro
@@ -80,10 +80,8 @@ SUBDIRS=\
     qlabel \
     qlcdnumber \
     qlineedit \
-    qlist \
     qlistview \
     qlistwidget \
-    qlocale \
     #qlocalsocket \  # FIXME: uses qtscript (QTBUG-19242)
     qmacstyle \
     qmainwindow \
diff --git a/tests/auto/other.pro b/tests/auto/other.pro
index 1b8f3c7e39..14ef9bc89c 100644
--- a/tests/auto/other.pro
+++ b/tests/auto/other.pro
@@ -5,7 +5,6 @@ TEMPLATE=subdirs
 SUBDIRS=\
 #           baselineexample \ Just an example demonstrating qbaselinetest usage
            lancelot \
-           qalgorithms \
            qcombobox \
            qfocusevent \
            qlayout \