diff --git a/tests/auto/corelib.pro b/tests/auto/corelib.pro index 1467db72877..d5b1634307b 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 62532b968fb..9d760792eec 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 similarity index 100% rename from tests/auto/qalgorithms/.gitignore rename to tests/auto/corelib/tools/qalgorithms/.gitignore diff --git a/tests/auto/qalgorithms/qalgorithms.pro b/tests/auto/corelib/tools/qalgorithms/qalgorithms.pro similarity index 100% rename from tests/auto/qalgorithms/qalgorithms.pro rename to 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 similarity index 100% rename from tests/auto/qalgorithms/tst_qalgorithms.cpp rename to tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp diff --git a/tests/auto/qbitarray/.gitignore b/tests/auto/corelib/tools/qbitarray/.gitignore similarity index 100% rename from tests/auto/qbitarray/.gitignore rename to tests/auto/corelib/tools/qbitarray/.gitignore diff --git a/tests/auto/qbitarray/qbitarray.pro b/tests/auto/corelib/tools/qbitarray/qbitarray.pro similarity index 100% rename from tests/auto/qbitarray/qbitarray.pro rename to 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 similarity index 100% rename from tests/auto/qbitarray/tst_qbitarray.cpp rename to tests/auto/corelib/tools/qbitarray/tst_qbitarray.cpp diff --git a/tests/auto/qbytearray/.gitattributes b/tests/auto/corelib/tools/qbytearray/.gitattributes similarity index 100% rename from tests/auto/qbytearray/.gitattributes rename to tests/auto/corelib/tools/qbytearray/.gitattributes diff --git a/tests/auto/qbytearray/.gitignore b/tests/auto/corelib/tools/qbytearray/.gitignore similarity index 100% rename from tests/auto/qbytearray/.gitignore rename to tests/auto/corelib/tools/qbytearray/.gitignore diff --git a/tests/auto/qbytearray/qbytearray.pro b/tests/auto/corelib/tools/qbytearray/qbytearray.pro similarity index 100% rename from tests/auto/qbytearray/qbytearray.pro rename to tests/auto/corelib/tools/qbytearray/qbytearray.pro diff --git a/tests/auto/qbytearray/rfc3252.txt b/tests/auto/corelib/tools/qbytearray/rfc3252.txt similarity index 100% rename from tests/auto/qbytearray/rfc3252.txt rename to 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 similarity index 100% rename from tests/auto/qbytearray/tst_qbytearray.cpp rename to tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp diff --git a/tests/auto/qbytearraymatcher/qbytearraymatcher.pro b/tests/auto/corelib/tools/qbytearraymatcher/qbytearraymatcher.pro similarity index 100% rename from tests/auto/qbytearraymatcher/qbytearraymatcher.pro rename to 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 similarity index 100% rename from tests/auto/qbytearraymatcher/tst_qbytearraymatcher.cpp rename to tests/auto/corelib/tools/qbytearraymatcher/tst_qbytearraymatcher.cpp diff --git a/tests/auto/qcache/.gitignore b/tests/auto/corelib/tools/qcache/.gitignore similarity index 100% rename from tests/auto/qcache/.gitignore rename to tests/auto/corelib/tools/qcache/.gitignore diff --git a/tests/auto/qcache/qcache.pro b/tests/auto/corelib/tools/qcache/qcache.pro similarity index 100% rename from tests/auto/qcache/qcache.pro rename to 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 similarity index 100% rename from tests/auto/qcache/tst_qcache.cpp rename to tests/auto/corelib/tools/qcache/tst_qcache.cpp diff --git a/tests/auto/qchar/.gitignore b/tests/auto/corelib/tools/qchar/.gitignore similarity index 100% rename from tests/auto/qchar/.gitignore rename to tests/auto/corelib/tools/qchar/.gitignore diff --git a/tests/auto/qchar/NormalizationTest.txt b/tests/auto/corelib/tools/qchar/NormalizationTest.txt similarity index 100% rename from tests/auto/qchar/NormalizationTest.txt rename to tests/auto/corelib/tools/qchar/NormalizationTest.txt diff --git a/tests/auto/qchar/qchar.pro b/tests/auto/corelib/tools/qchar/qchar.pro similarity index 100% rename from tests/auto/qchar/qchar.pro rename to 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 similarity index 100% rename from tests/auto/qchar/tst_qchar.cpp rename to tests/auto/corelib/tools/qchar/tst_qchar.cpp diff --git a/tests/auto/qcontiguouscache/qcontiguouscache.pro b/tests/auto/corelib/tools/qcontiguouscache/qcontiguouscache.pro similarity index 100% rename from tests/auto/qcontiguouscache/qcontiguouscache.pro rename to 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 similarity index 100% rename from tests/auto/qcontiguouscache/tst_qcontiguouscache.cpp rename to tests/auto/corelib/tools/qcontiguouscache/tst_qcontiguouscache.cpp diff --git a/tests/auto/qcryptographichash/.gitignore b/tests/auto/corelib/tools/qcryptographichash/.gitignore similarity index 100% rename from tests/auto/qcryptographichash/.gitignore rename to tests/auto/corelib/tools/qcryptographichash/.gitignore diff --git a/tests/auto/qcryptographichash/qcryptographichash.pro b/tests/auto/corelib/tools/qcryptographichash/qcryptographichash.pro similarity index 100% rename from tests/auto/qcryptographichash/qcryptographichash.pro rename to 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 similarity index 100% rename from tests/auto/qcryptographichash/tst_qcryptographichash.cpp rename to tests/auto/corelib/tools/qcryptographichash/tst_qcryptographichash.cpp diff --git a/tests/auto/qdate/.gitignore b/tests/auto/corelib/tools/qdate/.gitignore similarity index 100% rename from tests/auto/qdate/.gitignore rename to tests/auto/corelib/tools/qdate/.gitignore diff --git a/tests/auto/qdate/qdate.pro b/tests/auto/corelib/tools/qdate/qdate.pro similarity index 100% rename from tests/auto/qdate/qdate.pro rename to 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 similarity index 100% rename from tests/auto/qdate/tst_qdate.cpp rename to tests/auto/corelib/tools/qdate/tst_qdate.cpp diff --git a/tests/auto/qdatetime/.gitignore b/tests/auto/corelib/tools/qdatetime/.gitignore similarity index 100% rename from tests/auto/qdatetime/.gitignore rename to tests/auto/corelib/tools/qdatetime/.gitignore diff --git a/tests/auto/qdatetime/qdatetime.pro b/tests/auto/corelib/tools/qdatetime/qdatetime.pro similarity index 100% rename from tests/auto/qdatetime/qdatetime.pro rename to 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 similarity index 100% rename from tests/auto/qdatetime/tst_qdatetime.cpp rename to tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp diff --git a/tests/auto/qeasingcurve/qeasingcurve.pro b/tests/auto/corelib/tools/qeasingcurve/qeasingcurve.pro similarity index 100% rename from tests/auto/qeasingcurve/qeasingcurve.pro rename to 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 similarity index 100% rename from tests/auto/qeasingcurve/tst_qeasingcurve.cpp rename to tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp diff --git a/tests/auto/qelapsedtimer/qelapsedtimer.pro b/tests/auto/corelib/tools/qelapsedtimer/qelapsedtimer.pro similarity index 100% rename from tests/auto/qelapsedtimer/qelapsedtimer.pro rename to 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 similarity index 100% rename from tests/auto/qelapsedtimer/tst_qelapsedtimer.cpp rename to tests/auto/corelib/tools/qelapsedtimer/tst_qelapsedtimer.cpp diff --git a/tests/auto/qexplicitlyshareddatapointer/.gitignore b/tests/auto/corelib/tools/qexplicitlyshareddatapointer/.gitignore similarity index 100% rename from tests/auto/qexplicitlyshareddatapointer/.gitignore rename to tests/auto/corelib/tools/qexplicitlyshareddatapointer/.gitignore diff --git a/tests/auto/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro b/tests/auto/corelib/tools/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro similarity index 100% rename from tests/auto/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro rename to 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 similarity index 100% rename from tests/auto/qexplicitlyshareddatapointer/tst_qexplicitlyshareddatapointer.cpp rename to tests/auto/corelib/tools/qexplicitlyshareddatapointer/tst_qexplicitlyshareddatapointer.cpp diff --git a/tests/auto/qfreelist/qfreelist.pro b/tests/auto/corelib/tools/qfreelist/qfreelist.pro similarity index 100% rename from tests/auto/qfreelist/qfreelist.pro rename to 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 similarity index 100% rename from tests/auto/qfreelist/tst_qfreelist.cpp rename to tests/auto/corelib/tools/qfreelist/tst_qfreelist.cpp diff --git a/tests/auto/qhash/.gitignore b/tests/auto/corelib/tools/qhash/.gitignore similarity index 100% rename from tests/auto/qhash/.gitignore rename to tests/auto/corelib/tools/qhash/.gitignore diff --git a/tests/auto/qhash/qhash.pro b/tests/auto/corelib/tools/qhash/qhash.pro similarity index 100% rename from tests/auto/qhash/qhash.pro rename to 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 similarity index 100% rename from tests/auto/qhash/tst_qhash.cpp rename to tests/auto/corelib/tools/qhash/tst_qhash.cpp diff --git a/tests/auto/qline/.gitignore b/tests/auto/corelib/tools/qline/.gitignore similarity index 100% rename from tests/auto/qline/.gitignore rename to tests/auto/corelib/tools/qline/.gitignore diff --git a/tests/auto/qline/qline.pro b/tests/auto/corelib/tools/qline/qline.pro similarity index 100% rename from tests/auto/qline/qline.pro rename to 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 similarity index 100% rename from tests/auto/qline/tst_qline.cpp rename to tests/auto/corelib/tools/qline/tst_qline.cpp diff --git a/tests/auto/qlist/.gitignore b/tests/auto/corelib/tools/qlist/.gitignore similarity index 100% rename from tests/auto/qlist/.gitignore rename to tests/auto/corelib/tools/qlist/.gitignore diff --git a/tests/auto/qlist/qlist.pro b/tests/auto/corelib/tools/qlist/qlist.pro similarity index 100% rename from tests/auto/qlist/qlist.pro rename to 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 similarity index 100% rename from tests/auto/qlist/tst_qlist.cpp rename to tests/auto/corelib/tools/qlist/tst_qlist.cpp diff --git a/tests/auto/qlocale/.gitignore b/tests/auto/corelib/tools/qlocale/.gitignore similarity index 100% rename from tests/auto/qlocale/.gitignore rename to tests/auto/corelib/tools/qlocale/.gitignore diff --git a/tests/auto/qlocale/qlocale.pro b/tests/auto/corelib/tools/qlocale/qlocale.pro similarity index 100% rename from tests/auto/qlocale/qlocale.pro rename to 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 similarity index 100% rename from tests/auto/qlocale/syslocaleapp/syslocaleapp.cpp rename to 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 similarity index 100% rename from tests/auto/qlocale/syslocaleapp/syslocaleapp.pro rename to 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 similarity index 100% rename from tests/auto/qlocale/test/test.pro rename to 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 similarity index 100% rename from tests/auto/qlocale/tst_qlocale.cpp rename to tests/auto/corelib/tools/qlocale/tst_qlocale.cpp diff --git a/tests/auto/qmap/.gitignore b/tests/auto/corelib/tools/qmap/.gitignore similarity index 100% rename from tests/auto/qmap/.gitignore rename to tests/auto/corelib/tools/qmap/.gitignore diff --git a/tests/auto/qmap/qmap.pro b/tests/auto/corelib/tools/qmap/qmap.pro similarity index 100% rename from tests/auto/qmap/qmap.pro rename to 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 similarity index 100% rename from tests/auto/qmap/tst_qmap.cpp rename to tests/auto/corelib/tools/qmap/tst_qmap.cpp diff --git a/tests/auto/qmargins/qmargins.pro b/tests/auto/corelib/tools/qmargins/qmargins.pro similarity index 100% rename from tests/auto/qmargins/qmargins.pro rename to 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 similarity index 100% rename from tests/auto/qmargins/tst_qmargins.cpp rename to tests/auto/corelib/tools/qmargins/tst_qmargins.cpp diff --git a/tests/auto/qpoint/.gitignore b/tests/auto/corelib/tools/qpoint/.gitignore similarity index 100% rename from tests/auto/qpoint/.gitignore rename to tests/auto/corelib/tools/qpoint/.gitignore diff --git a/tests/auto/qpoint/qpoint.pro b/tests/auto/corelib/tools/qpoint/qpoint.pro similarity index 100% rename from tests/auto/qpoint/qpoint.pro rename to 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 similarity index 100% rename from tests/auto/qpoint/tst_qpoint.cpp rename to tests/auto/corelib/tools/qpoint/tst_qpoint.cpp diff --git a/tests/auto/qqueue/.gitignore b/tests/auto/corelib/tools/qqueue/.gitignore similarity index 100% rename from tests/auto/qqueue/.gitignore rename to tests/auto/corelib/tools/qqueue/.gitignore diff --git a/tests/auto/qqueue/qqueue.pro b/tests/auto/corelib/tools/qqueue/qqueue.pro similarity index 100% rename from tests/auto/qqueue/qqueue.pro rename to 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 similarity index 100% rename from tests/auto/qqueue/tst_qqueue.cpp rename to tests/auto/corelib/tools/qqueue/tst_qqueue.cpp diff --git a/tests/auto/qrect/.gitignore b/tests/auto/corelib/tools/qrect/.gitignore similarity index 100% rename from tests/auto/qrect/.gitignore rename to tests/auto/corelib/tools/qrect/.gitignore diff --git a/tests/auto/qrect/qrect.pro b/tests/auto/corelib/tools/qrect/qrect.pro similarity index 100% rename from tests/auto/qrect/qrect.pro rename to 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 similarity index 100% rename from tests/auto/qrect/tst_qrect.cpp rename to tests/auto/corelib/tools/qrect/tst_qrect.cpp diff --git a/tests/auto/qregexp/.gitignore b/tests/auto/corelib/tools/qregexp/.gitignore similarity index 100% rename from tests/auto/qregexp/.gitignore rename to tests/auto/corelib/tools/qregexp/.gitignore diff --git a/tests/auto/qregexp/qregexp.pro b/tests/auto/corelib/tools/qregexp/qregexp.pro similarity index 100% rename from tests/auto/qregexp/qregexp.pro rename to 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 similarity index 100% rename from tests/auto/qregexp/tst_qregexp.cpp rename to tests/auto/corelib/tools/qregexp/tst_qregexp.cpp diff --git a/tests/auto/qringbuffer/qringbuffer.pro b/tests/auto/corelib/tools/qringbuffer/qringbuffer.pro similarity index 100% rename from tests/auto/qringbuffer/qringbuffer.pro rename to 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 similarity index 100% rename from tests/auto/qringbuffer/tst_qringbuffer.cpp rename to tests/auto/corelib/tools/qringbuffer/tst_qringbuffer.cpp diff --git a/tests/auto/qscopedpointer/.gitignore b/tests/auto/corelib/tools/qscopedpointer/.gitignore similarity index 100% rename from tests/auto/qscopedpointer/.gitignore rename to tests/auto/corelib/tools/qscopedpointer/.gitignore diff --git a/tests/auto/qscopedpointer/qscopedpointer.pro b/tests/auto/corelib/tools/qscopedpointer/qscopedpointer.pro similarity index 100% rename from tests/auto/qscopedpointer/qscopedpointer.pro rename to 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 similarity index 100% rename from tests/auto/qscopedpointer/tst_qscopedpointer.cpp rename to tests/auto/corelib/tools/qscopedpointer/tst_qscopedpointer.cpp diff --git a/tests/auto/qscopedvaluerollback/qscopedvaluerollback.pro b/tests/auto/corelib/tools/qscopedvaluerollback/qscopedvaluerollback.pro similarity index 100% rename from tests/auto/qscopedvaluerollback/qscopedvaluerollback.pro rename to 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 similarity index 100% rename from tests/auto/qscopedvaluerollback/tst_qscopedvaluerollback.cpp rename to tests/auto/corelib/tools/qscopedvaluerollback/tst_qscopedvaluerollback.cpp diff --git a/tests/auto/qset/.gitignore b/tests/auto/corelib/tools/qset/.gitignore similarity index 100% rename from tests/auto/qset/.gitignore rename to tests/auto/corelib/tools/qset/.gitignore diff --git a/tests/auto/qset/qset.pro b/tests/auto/corelib/tools/qset/qset.pro similarity index 100% rename from tests/auto/qset/qset.pro rename to 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 similarity index 100% rename from tests/auto/qset/tst_qset.cpp rename to tests/auto/corelib/tools/qset/tst_qset.cpp diff --git a/tests/auto/qsharedpointer/.gitignore b/tests/auto/corelib/tools/qsharedpointer/.gitignore similarity index 100% rename from tests/auto/qsharedpointer/.gitignore rename to tests/auto/corelib/tools/qsharedpointer/.gitignore diff --git a/tests/auto/qsharedpointer/externaltests.cpp b/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp similarity index 100% rename from tests/auto/qsharedpointer/externaltests.cpp rename to tests/auto/corelib/tools/qsharedpointer/externaltests.cpp diff --git a/tests/auto/qsharedpointer/externaltests.h b/tests/auto/corelib/tools/qsharedpointer/externaltests.h similarity index 100% rename from tests/auto/qsharedpointer/externaltests.h rename to tests/auto/corelib/tools/qsharedpointer/externaltests.h diff --git a/tests/auto/qsharedpointer/externaltests.pri b/tests/auto/corelib/tools/qsharedpointer/externaltests.pri similarity index 100% rename from tests/auto/qsharedpointer/externaltests.pri rename to tests/auto/corelib/tools/qsharedpointer/externaltests.pri diff --git a/tests/auto/qsharedpointer/forwarddeclaration.cpp b/tests/auto/corelib/tools/qsharedpointer/forwarddeclaration.cpp similarity index 100% rename from tests/auto/qsharedpointer/forwarddeclaration.cpp rename to tests/auto/corelib/tools/qsharedpointer/forwarddeclaration.cpp diff --git a/tests/auto/qsharedpointer/forwarddeclared.cpp b/tests/auto/corelib/tools/qsharedpointer/forwarddeclared.cpp similarity index 100% rename from tests/auto/qsharedpointer/forwarddeclared.cpp rename to tests/auto/corelib/tools/qsharedpointer/forwarddeclared.cpp diff --git a/tests/auto/qsharedpointer/forwarddeclared.h b/tests/auto/corelib/tools/qsharedpointer/forwarddeclared.h similarity index 100% rename from tests/auto/qsharedpointer/forwarddeclared.h rename to tests/auto/corelib/tools/qsharedpointer/forwarddeclared.h diff --git a/tests/auto/qsharedpointer/qsharedpointer.pro b/tests/auto/corelib/tools/qsharedpointer/qsharedpointer.pro similarity index 100% rename from tests/auto/qsharedpointer/qsharedpointer.pro rename to 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 similarity index 100% rename from tests/auto/qsharedpointer/tst_qsharedpointer.cpp rename to tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp diff --git a/tests/auto/qsharedpointer/wrapper.cpp b/tests/auto/corelib/tools/qsharedpointer/wrapper.cpp similarity index 100% rename from tests/auto/qsharedpointer/wrapper.cpp rename to tests/auto/corelib/tools/qsharedpointer/wrapper.cpp diff --git a/tests/auto/qsharedpointer/wrapper.h b/tests/auto/corelib/tools/qsharedpointer/wrapper.h similarity index 100% rename from tests/auto/qsharedpointer/wrapper.h rename to tests/auto/corelib/tools/qsharedpointer/wrapper.h diff --git a/tests/auto/qsize/.gitignore b/tests/auto/corelib/tools/qsize/.gitignore similarity index 100% rename from tests/auto/qsize/.gitignore rename to tests/auto/corelib/tools/qsize/.gitignore diff --git a/tests/auto/qsize/qsize.pro b/tests/auto/corelib/tools/qsize/qsize.pro similarity index 100% rename from tests/auto/qsize/qsize.pro rename to 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 similarity index 100% rename from tests/auto/qsize/tst_qsize.cpp rename to tests/auto/corelib/tools/qsize/tst_qsize.cpp diff --git a/tests/auto/qsizef/.gitignore b/tests/auto/corelib/tools/qsizef/.gitignore similarity index 100% rename from tests/auto/qsizef/.gitignore rename to tests/auto/corelib/tools/qsizef/.gitignore diff --git a/tests/auto/qsizef/qsizef.pro b/tests/auto/corelib/tools/qsizef/qsizef.pro similarity index 100% rename from tests/auto/qsizef/qsizef.pro rename to 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 similarity index 100% rename from tests/auto/qsizef/tst_qsizef.cpp rename to tests/auto/corelib/tools/qsizef/tst_qsizef.cpp diff --git a/tests/auto/qstl/.gitignore b/tests/auto/corelib/tools/qstl/.gitignore similarity index 100% rename from tests/auto/qstl/.gitignore rename to tests/auto/corelib/tools/qstl/.gitignore diff --git a/tests/auto/qstl/qstl.pro b/tests/auto/corelib/tools/qstl/qstl.pro similarity index 100% rename from tests/auto/qstl/qstl.pro rename to 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 similarity index 100% rename from tests/auto/qstl/tst_qstl.cpp rename to tests/auto/corelib/tools/qstl/tst_qstl.cpp diff --git a/tests/auto/qstring/.gitignore b/tests/auto/corelib/tools/qstring/.gitignore similarity index 100% rename from tests/auto/qstring/.gitignore rename to tests/auto/corelib/tools/qstring/.gitignore diff --git a/tests/auto/qstring/double_data.h b/tests/auto/corelib/tools/qstring/double_data.h similarity index 100% rename from tests/auto/qstring/double_data.h rename to tests/auto/corelib/tools/qstring/double_data.h diff --git a/tests/auto/qstring/qstring.pro b/tests/auto/corelib/tools/qstring/qstring.pro similarity index 100% rename from tests/auto/qstring/qstring.pro rename to 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 similarity index 100% rename from tests/auto/qstring/tst_qstring.cpp rename to 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 00000000000..d73d541502f --- /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 similarity index 100% rename from tests/auto/qstringbuilder1/qstringbuilder1.pro rename to 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 similarity index 100% rename from tests/auto/qstringbuilder1/stringbuilder.cpp rename to 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 similarity index 100% rename from tests/auto/qstringbuilder1/tst_qstringbuilder1.cpp rename to 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 similarity index 100% rename from tests/auto/qstringbuilder2/qstringbuilder2.pro rename to 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 similarity index 100% rename from tests/auto/qstringbuilder2/tst_qstringbuilder2.cpp rename to 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 similarity index 100% rename from tests/auto/qstringbuilder3/qstringbuilder3.pro rename to 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 similarity index 100% rename from tests/auto/qstringbuilder3/tst_qstringbuilder3.cpp rename to 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 similarity index 100% rename from tests/auto/qstringbuilder4/qstringbuilder4.pro rename to 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 similarity index 100% rename from tests/auto/qstringbuilder4/tst_qstringbuilder4.cpp rename to tests/auto/corelib/tools/qstringbuilder/qstringbuilder4/tst_qstringbuilder4.cpp diff --git a/tests/auto/qstringlist/.gitignore b/tests/auto/corelib/tools/qstringlist/.gitignore similarity index 100% rename from tests/auto/qstringlist/.gitignore rename to tests/auto/corelib/tools/qstringlist/.gitignore diff --git a/tests/auto/qstringlist/qstringlist.pro b/tests/auto/corelib/tools/qstringlist/qstringlist.pro similarity index 100% rename from tests/auto/qstringlist/qstringlist.pro rename to 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 similarity index 100% rename from tests/auto/qstringlist/tst_qstringlist.cpp rename to tests/auto/corelib/tools/qstringlist/tst_qstringlist.cpp diff --git a/tests/auto/qstringmatcher/.gitignore b/tests/auto/corelib/tools/qstringmatcher/.gitignore similarity index 100% rename from tests/auto/qstringmatcher/.gitignore rename to tests/auto/corelib/tools/qstringmatcher/.gitignore diff --git a/tests/auto/qstringmatcher/qstringmatcher.pro b/tests/auto/corelib/tools/qstringmatcher/qstringmatcher.pro similarity index 100% rename from tests/auto/qstringmatcher/qstringmatcher.pro rename to 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 similarity index 100% rename from tests/auto/qstringmatcher/tst_qstringmatcher.cpp rename to tests/auto/corelib/tools/qstringmatcher/tst_qstringmatcher.cpp diff --git a/tests/auto/qstringref/qstringref.pro b/tests/auto/corelib/tools/qstringref/qstringref.pro similarity index 100% rename from tests/auto/qstringref/qstringref.pro rename to 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 similarity index 100% rename from tests/auto/qstringref/tst_qstringref.cpp rename to tests/auto/corelib/tools/qstringref/tst_qstringref.cpp diff --git a/tests/auto/qtextboundaryfinder/.gitignore b/tests/auto/corelib/tools/qtextboundaryfinder/.gitignore similarity index 100% rename from tests/auto/qtextboundaryfinder/.gitignore rename to tests/auto/corelib/tools/qtextboundaryfinder/.gitignore diff --git a/tests/auto/qtextboundaryfinder/data/GraphemeBreakTest.txt b/tests/auto/corelib/tools/qtextboundaryfinder/data/GraphemeBreakTest.txt similarity index 100% rename from tests/auto/qtextboundaryfinder/data/GraphemeBreakTest.txt rename to 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 similarity index 100% rename from tests/auto/qtextboundaryfinder/data/SentenceBreakTest.txt rename to 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 similarity index 100% rename from tests/auto/qtextboundaryfinder/data/WordBreakTest.txt rename to tests/auto/corelib/tools/qtextboundaryfinder/data/WordBreakTest.txt diff --git a/tests/auto/qtextboundaryfinder/qtextboundaryfinder.pro b/tests/auto/corelib/tools/qtextboundaryfinder/qtextboundaryfinder.pro similarity index 100% rename from tests/auto/qtextboundaryfinder/qtextboundaryfinder.pro rename to 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 similarity index 100% rename from tests/auto/qtextboundaryfinder/tst_qtextboundaryfinder.cpp rename to tests/auto/corelib/tools/qtextboundaryfinder/tst_qtextboundaryfinder.cpp diff --git a/tests/auto/qtime/.gitignore b/tests/auto/corelib/tools/qtime/.gitignore similarity index 100% rename from tests/auto/qtime/.gitignore rename to tests/auto/corelib/tools/qtime/.gitignore diff --git a/tests/auto/qtime/qtime.pro b/tests/auto/corelib/tools/qtime/qtime.pro similarity index 100% rename from tests/auto/qtime/qtime.pro rename to 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 similarity index 100% rename from tests/auto/qtime/tst_qtime.cpp rename to tests/auto/corelib/tools/qtime/tst_qtime.cpp diff --git a/tests/auto/qtimeline/.gitignore b/tests/auto/corelib/tools/qtimeline/.gitignore similarity index 100% rename from tests/auto/qtimeline/.gitignore rename to tests/auto/corelib/tools/qtimeline/.gitignore diff --git a/tests/auto/qtimeline/qtimeline.pro b/tests/auto/corelib/tools/qtimeline/qtimeline.pro similarity index 100% rename from tests/auto/qtimeline/qtimeline.pro rename to 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 similarity index 100% rename from tests/auto/qtimeline/tst_qtimeline.cpp rename to tests/auto/corelib/tools/qtimeline/tst_qtimeline.cpp diff --git a/tests/auto/qvarlengtharray/.gitignore b/tests/auto/corelib/tools/qvarlengtharray/.gitignore similarity index 100% rename from tests/auto/qvarlengtharray/.gitignore rename to tests/auto/corelib/tools/qvarlengtharray/.gitignore diff --git a/tests/auto/qvarlengtharray/qvarlengtharray.pro b/tests/auto/corelib/tools/qvarlengtharray/qvarlengtharray.pro similarity index 100% rename from tests/auto/qvarlengtharray/qvarlengtharray.pro rename to 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 similarity index 100% rename from tests/auto/qvarlengtharray/tst_qvarlengtharray.cpp rename to tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp diff --git a/tests/auto/qvector/.gitignore b/tests/auto/corelib/tools/qvector/.gitignore similarity index 100% rename from tests/auto/qvector/.gitignore rename to tests/auto/corelib/tools/qvector/.gitignore diff --git a/tests/auto/qvector/qvector.pro b/tests/auto/corelib/tools/qvector/qvector.pro similarity index 100% rename from tests/auto/qvector/qvector.pro rename to 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 similarity index 100% rename from tests/auto/qvector/tst_qvector.cpp rename to 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 00000000000..930799e3b33 --- /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 047f30fd383..9305a6eb55a 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 1b8f3c7e39c..14ef9bc89c1 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 \