diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index 069cb0f12d8..68f173cd1ba 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -105,24 +105,24 @@ DEPEND_SRC = \ $(SOURCE_PATH)/src/corelib/serialization/qtextstream.cpp \ $(SOURCE_PATH)/src/corelib/serialization/qxmlstream.cpp \ $(SOURCE_PATH)/src/corelib/serialization/qxmlutils.cpp \ + $(SOURCE_PATH)/src/corelib/text/qbytearray.cpp\ + $(SOURCE_PATH)/src/corelib/text/qbytearraymatcher.cpp \ + $(SOURCE_PATH)/src/corelib/text/qlocale.cpp \ + $(SOURCE_PATH)/src/corelib/text/qlocale_tools.cpp \ + $(SOURCE_PATH)/src/corelib/text/qregexp.cpp \ + $(SOURCE_PATH)/src/corelib/text/qstringbuilder.cpp \ + $(SOURCE_PATH)/src/corelib/text/qstring.cpp \ + $(SOURCE_PATH)/src/corelib/text/qstringlist.cpp \ + $(SOURCE_PATH)/src/corelib/text/qvsnprintf.cpp \ $(SOURCE_PATH)/src/corelib/time/qdatetime.cpp \ $(SOURCE_PATH)/src/corelib/tools/qarraydata.cpp \ $(SOURCE_PATH)/src/corelib/tools/qbitarray.cpp \ - $(SOURCE_PATH)/src/corelib/tools/qbytearray.cpp\ - $(SOURCE_PATH)/src/corelib/tools/qbytearraymatcher.cpp \ $(SOURCE_PATH)/src/corelib/tools/qcryptographichash.cpp \ $(SOURCE_PATH)/src/corelib/tools/qhash.cpp \ $(SOURCE_PATH)/src/corelib/tools/qlist.cpp \ - $(SOURCE_PATH)/src/corelib/tools/qlocale.cpp \ - $(SOURCE_PATH)/src/corelib/tools/qlocale_tools.cpp \ $(SOURCE_PATH)/src/corelib/tools/qmap.cpp \ - $(SOURCE_PATH)/src/corelib/tools/qregexp.cpp \ $(SOURCE_PATH)/src/corelib/tools/qringbuffer.cpp \ - $(SOURCE_PATH)/src/corelib/tools/qstringbuilder.cpp \ - $(SOURCE_PATH)/src/corelib/tools/qstring.cpp \ - $(SOURCE_PATH)/src/corelib/tools/qstringlist.cpp \ $(SOURCE_PATH)/src/corelib/tools/qversionnumber.cpp \ - $(SOURCE_PATH)/src/corelib/tools/qvsnprintf.cpp \ $(QTSRCS) $(QTSRCS2) # QTSRCS and QTSRCS2 come from Makefile.unix.* (concatenated with this # by configure); QTSRCS2 may include *.mm entries on macOS. @@ -302,13 +302,13 @@ qglobal.o: $(SOURCE_PATH)/src/corelib/global/qglobal.cpp qarraydata.o: $(SOURCE_PATH)/src/corelib/tools/qarraydata.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< -qbytearray.o: $(SOURCE_PATH)/src/corelib/tools/qbytearray.cpp +qbytearray.o: $(SOURCE_PATH)/src/corelib/text/qbytearray.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< -qvsnprintf.o: $(SOURCE_PATH)/src/corelib/tools/qvsnprintf.cpp +qvsnprintf.o: $(SOURCE_PATH)/src/corelib/text/qvsnprintf.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< -qbytearraymatcher.o: $(SOURCE_PATH)/src/corelib/tools/qbytearraymatcher.cpp +qbytearraymatcher.o: $(SOURCE_PATH)/src/corelib/text/qbytearraymatcher.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< qmetatype.o: $(SOURCE_PATH)/src/corelib/kernel/qmetatype.cpp @@ -338,22 +338,22 @@ qcore_foundation.o: $(SOURCE_PATH)/src/corelib/kernel/qcore_foundation.mm qutfcodec.o: $(SOURCE_PATH)/src/corelib/codecs/qutfcodec.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< -qstring.o: $(SOURCE_PATH)/src/corelib/tools/qstring.cpp +qstring.o: $(SOURCE_PATH)/src/corelib/text/qstring.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< -qstringbuilder.o: $(SOURCE_PATH)/src/corelib/tools/qstringbuilder.cpp +qstringbuilder.o: $(SOURCE_PATH)/src/corelib/text/qstringbuilder.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< -qlocale.o: $(SOURCE_PATH)/src/corelib/tools/qlocale.cpp +qlocale.o: $(SOURCE_PATH)/src/corelib/text/qlocale.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< -qlocale_tools.o: $(SOURCE_PATH)/src/corelib/tools/qlocale_tools.cpp +qlocale_tools.o: $(SOURCE_PATH)/src/corelib/text/qlocale_tools.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< -qlocale_unix.o: $(SOURCE_PATH)/src/corelib/tools/qlocale_unix.cpp +qlocale_unix.o: $(SOURCE_PATH)/src/corelib/text/qlocale_unix.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< -qlocale_win.o: $(SOURCE_PATH)/src/corelib/tools/qlocale_win.cpp +qlocale_win.o: $(SOURCE_PATH)/src/corelib/text/qlocale_win.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< qversionnumber.o: $(SOURCE_PATH)/src/corelib/tools/qversionnumber.cpp @@ -407,7 +407,7 @@ qabstractfileengine.o: $(SOURCE_PATH)/src/corelib/io/qabstractfileengine.cpp qtemporaryfile.o: $(SOURCE_PATH)/src/corelib/io/qtemporaryfile.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< -qregexp.o: $(SOURCE_PATH)/src/corelib/tools/qregexp.cpp +qregexp.o: $(SOURCE_PATH)/src/corelib/text/qregexp.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< qbitarray.o: $(SOURCE_PATH)/src/corelib/tools/qbitarray.cpp @@ -428,7 +428,7 @@ qfileinfo.o: $(SOURCE_PATH)/src/corelib/io/qfileinfo.cpp qdatetime.o: $(SOURCE_PATH)/src/corelib/time/qdatetime.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< -qstringlist.o: $(SOURCE_PATH)/src/corelib/tools/qstringlist.cpp +qstringlist.o: $(SOURCE_PATH)/src/corelib/text/qstringlist.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< qmap.o: $(SOURCE_PATH)/src/corelib/tools/qmap.cpp diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index d300e492153..43059f9af0b 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -196,6 +196,9 @@ qmake_pch.obj: {$(SOURCE_PATH)\src\corelib\serialization}.cpp{}.obj:: $(CXX) $(CXXFLAGS) $< +{$(SOURCE_PATH)\src\corelib\text}.cpp{}.obj:: + $(CXX) $(CXXFLAGS) $< + {$(SOURCE_PATH)\src\corelib\time}.cpp{}.obj:: $(CXX) $(CXXFLAGS) $< diff --git a/src/corelib/configure.json b/src/corelib/configure.json index 88c7bbfbed0..83c30fb47ba 100644 --- a/src/corelib/configure.json +++ b/src/corelib/configure.json @@ -596,7 +596,7 @@ "qDoubleSnprintf(argv[0], 1, invalidLocale, \"invalid format\", a);", "qDoubleSscanf(argv[0], invalidLocale, \"invalid format\", &a, &argc);" ], - "qmake": "DEFINES += QDSP_P_H=$$shell_quote(\\\"@PWD@/tools/qdoublescanprint_p.h\\\")" + "qmake": "DEFINES += QDSP_P_H=$$shell_quote(\\\"@PWD@/text/qdoublescanprint_p.h\\\")" } } }, diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index 521f8402920..b9bcc70e175 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -36,6 +36,7 @@ qtConfig(animation): include(animation/animation.pri) include(global/global.pri) include(thread/thread.pri) include(tools/tools.pri) +include(text/text.pri) include(time/time.pri) include(io/io.pri) include(itemmodels/itemmodels.pri) diff --git a/src/corelib/tools/UNICODE_LICENSE.txt b/src/corelib/text/UNICODE_LICENSE.txt similarity index 100% rename from src/corelib/tools/UNICODE_LICENSE.txt rename to src/corelib/text/UNICODE_LICENSE.txt diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/text/qbytearray.cpp similarity index 99% rename from src/corelib/tools/qbytearray.cpp rename to src/corelib/text/qbytearray.cpp index ecbb4743afb..fcf7b5e709c 100644 --- a/src/corelib/tools/qbytearray.cpp +++ b/src/corelib/text/qbytearray.cpp @@ -40,7 +40,7 @@ #include "qbytearray.h" #include "qbytearraymatcher.h" -#include "qtools_p.h" +#include "private/qtools_p.h" #include "qstring.h" #include "qlist.h" #include "qlocale.h" diff --git a/src/corelib/tools/qbytearray.h b/src/corelib/text/qbytearray.h similarity index 100% rename from src/corelib/tools/qbytearray.h rename to src/corelib/text/qbytearray.h diff --git a/src/corelib/tools/qbytearray_p.h b/src/corelib/text/qbytearray_p.h similarity index 98% rename from src/corelib/tools/qbytearray_p.h rename to src/corelib/text/qbytearray_p.h index 6ebff739cdd..3c6257f7860 100644 --- a/src/corelib/tools/qbytearray_p.h +++ b/src/corelib/text/qbytearray_p.h @@ -52,7 +52,7 @@ // #include -#include "qtools_p.h" +#include "private/qtools_p.h" QT_BEGIN_NAMESPACE diff --git a/src/corelib/tools/qbytearraylist.cpp b/src/corelib/text/qbytearraylist.cpp similarity index 100% rename from src/corelib/tools/qbytearraylist.cpp rename to src/corelib/text/qbytearraylist.cpp diff --git a/src/corelib/tools/qbytearraylist.h b/src/corelib/text/qbytearraylist.h similarity index 100% rename from src/corelib/tools/qbytearraylist.h rename to src/corelib/text/qbytearraylist.h diff --git a/src/corelib/tools/qbytearraymatcher.cpp b/src/corelib/text/qbytearraymatcher.cpp similarity index 100% rename from src/corelib/tools/qbytearraymatcher.cpp rename to src/corelib/text/qbytearraymatcher.cpp diff --git a/src/corelib/tools/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h similarity index 100% rename from src/corelib/tools/qbytearraymatcher.h rename to src/corelib/text/qbytearraymatcher.h diff --git a/src/corelib/tools/qbytedata_p.h b/src/corelib/text/qbytedata_p.h similarity index 100% rename from src/corelib/tools/qbytedata_p.h rename to src/corelib/text/qbytedata_p.h diff --git a/src/corelib/tools/qchar.cpp b/src/corelib/text/qchar.cpp similarity index 100% rename from src/corelib/tools/qchar.cpp rename to src/corelib/text/qchar.cpp diff --git a/src/corelib/tools/qchar.h b/src/corelib/text/qchar.h similarity index 100% rename from src/corelib/tools/qchar.h rename to src/corelib/text/qchar.h diff --git a/src/corelib/tools/qcollator.cpp b/src/corelib/text/qcollator.cpp similarity index 100% rename from src/corelib/tools/qcollator.cpp rename to src/corelib/text/qcollator.cpp diff --git a/src/corelib/tools/qcollator.h b/src/corelib/text/qcollator.h similarity index 100% rename from src/corelib/tools/qcollator.h rename to src/corelib/text/qcollator.h diff --git a/src/corelib/tools/qcollator_icu.cpp b/src/corelib/text/qcollator_icu.cpp similarity index 100% rename from src/corelib/tools/qcollator_icu.cpp rename to src/corelib/text/qcollator_icu.cpp diff --git a/src/corelib/tools/qcollator_macx.cpp b/src/corelib/text/qcollator_macx.cpp similarity index 100% rename from src/corelib/tools/qcollator_macx.cpp rename to src/corelib/text/qcollator_macx.cpp diff --git a/src/corelib/tools/qcollator_p.h b/src/corelib/text/qcollator_p.h similarity index 100% rename from src/corelib/tools/qcollator_p.h rename to src/corelib/text/qcollator_p.h diff --git a/src/corelib/tools/qcollator_posix.cpp b/src/corelib/text/qcollator_posix.cpp similarity index 100% rename from src/corelib/tools/qcollator_posix.cpp rename to src/corelib/text/qcollator_posix.cpp diff --git a/src/corelib/tools/qcollator_win.cpp b/src/corelib/text/qcollator_win.cpp similarity index 100% rename from src/corelib/tools/qcollator_win.cpp rename to src/corelib/text/qcollator_win.cpp diff --git a/src/corelib/tools/qdoublescanprint_p.h b/src/corelib/text/qdoublescanprint_p.h similarity index 100% rename from src/corelib/tools/qdoublescanprint_p.h rename to src/corelib/text/qdoublescanprint_p.h diff --git a/src/corelib/tools/qharfbuzz.cpp b/src/corelib/text/qharfbuzz.cpp similarity index 100% rename from src/corelib/tools/qharfbuzz.cpp rename to src/corelib/text/qharfbuzz.cpp diff --git a/src/corelib/tools/qharfbuzz_p.h b/src/corelib/text/qharfbuzz_p.h similarity index 100% rename from src/corelib/tools/qharfbuzz_p.h rename to src/corelib/text/qharfbuzz_p.h diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/text/qlocale.cpp similarity index 100% rename from src/corelib/tools/qlocale.cpp rename to src/corelib/text/qlocale.cpp diff --git a/src/corelib/tools/qlocale.h b/src/corelib/text/qlocale.h similarity index 100% rename from src/corelib/tools/qlocale.h rename to src/corelib/text/qlocale.h diff --git a/src/corelib/tools/qlocale.qdoc b/src/corelib/text/qlocale.qdoc similarity index 100% rename from src/corelib/tools/qlocale.qdoc rename to src/corelib/text/qlocale.qdoc diff --git a/src/corelib/tools/qlocale_data_p.h b/src/corelib/text/qlocale_data_p.h similarity index 100% rename from src/corelib/tools/qlocale_data_p.h rename to src/corelib/text/qlocale_data_p.h diff --git a/src/corelib/tools/qlocale_icu.cpp b/src/corelib/text/qlocale_icu.cpp similarity index 100% rename from src/corelib/tools/qlocale_icu.cpp rename to src/corelib/text/qlocale_icu.cpp diff --git a/src/corelib/tools/qlocale_mac.mm b/src/corelib/text/qlocale_mac.mm similarity index 100% rename from src/corelib/tools/qlocale_mac.mm rename to src/corelib/text/qlocale_mac.mm diff --git a/src/corelib/tools/qlocale_p.h b/src/corelib/text/qlocale_p.h similarity index 100% rename from src/corelib/tools/qlocale_p.h rename to src/corelib/text/qlocale_p.h diff --git a/src/corelib/tools/qlocale_tools.cpp b/src/corelib/text/qlocale_tools.cpp similarity index 100% rename from src/corelib/tools/qlocale_tools.cpp rename to src/corelib/text/qlocale_tools.cpp diff --git a/src/corelib/tools/qlocale_tools_p.h b/src/corelib/text/qlocale_tools_p.h similarity index 100% rename from src/corelib/tools/qlocale_tools_p.h rename to src/corelib/text/qlocale_tools_p.h diff --git a/src/corelib/tools/qlocale_unix.cpp b/src/corelib/text/qlocale_unix.cpp similarity index 100% rename from src/corelib/tools/qlocale_unix.cpp rename to src/corelib/text/qlocale_unix.cpp diff --git a/src/corelib/tools/qlocale_win.cpp b/src/corelib/text/qlocale_win.cpp similarity index 100% rename from src/corelib/tools/qlocale_win.cpp rename to src/corelib/text/qlocale_win.cpp diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/text/qregexp.cpp similarity index 100% rename from src/corelib/tools/qregexp.cpp rename to src/corelib/text/qregexp.cpp diff --git a/src/corelib/tools/qregexp.h b/src/corelib/text/qregexp.h similarity index 100% rename from src/corelib/tools/qregexp.h rename to src/corelib/text/qregexp.h diff --git a/src/corelib/tools/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp similarity index 100% rename from src/corelib/tools/qregularexpression.cpp rename to src/corelib/text/qregularexpression.cpp diff --git a/src/corelib/tools/qregularexpression.h b/src/corelib/text/qregularexpression.h similarity index 100% rename from src/corelib/tools/qregularexpression.h rename to src/corelib/text/qregularexpression.h diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/text/qstring.cpp similarity index 99% rename from src/corelib/tools/qstring.cpp rename to src/corelib/text/qstring.cpp index 12506afdef3..2a98b169f38 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/text/qstring.cpp @@ -49,8 +49,8 @@ #include #endif #include -#include -#include "qsimd_p.h" +#include "qlocale_tools_p.h" +#include "private/qsimd_p.h" #include #include #include @@ -59,7 +59,6 @@ #include "qstringbuilder.h" #include "qstringmatcher.h" #include "qvarlengtharray.h" -#include "qtools_p.h" #include "qdebug.h" #include "qendian.h" #include "qcollator.h" diff --git a/src/corelib/tools/qstring.h b/src/corelib/text/qstring.h similarity index 100% rename from src/corelib/tools/qstring.h rename to src/corelib/text/qstring.h diff --git a/src/corelib/tools/qstring_compat.cpp b/src/corelib/text/qstring_compat.cpp similarity index 100% rename from src/corelib/tools/qstring_compat.cpp rename to src/corelib/text/qstring_compat.cpp diff --git a/src/corelib/tools/qstring_mips_dsp_asm.S b/src/corelib/text/qstring_mips_dsp_asm.S similarity index 100% rename from src/corelib/tools/qstring_mips_dsp_asm.S rename to src/corelib/text/qstring_mips_dsp_asm.S diff --git a/src/corelib/tools/qstringalgorithms.h b/src/corelib/text/qstringalgorithms.h similarity index 100% rename from src/corelib/tools/qstringalgorithms.h rename to src/corelib/text/qstringalgorithms.h diff --git a/src/corelib/tools/qstringalgorithms_p.h b/src/corelib/text/qstringalgorithms_p.h similarity index 100% rename from src/corelib/tools/qstringalgorithms_p.h rename to src/corelib/text/qstringalgorithms_p.h diff --git a/src/corelib/tools/qstringbuilder.cpp b/src/corelib/text/qstringbuilder.cpp similarity index 100% rename from src/corelib/tools/qstringbuilder.cpp rename to src/corelib/text/qstringbuilder.cpp diff --git a/src/corelib/tools/qstringbuilder.h b/src/corelib/text/qstringbuilder.h similarity index 100% rename from src/corelib/tools/qstringbuilder.h rename to src/corelib/text/qstringbuilder.h diff --git a/src/corelib/tools/qstringiterator.qdoc b/src/corelib/text/qstringiterator.qdoc similarity index 100% rename from src/corelib/tools/qstringiterator.qdoc rename to src/corelib/text/qstringiterator.qdoc diff --git a/src/corelib/tools/qstringiterator_p.h b/src/corelib/text/qstringiterator_p.h similarity index 100% rename from src/corelib/tools/qstringiterator_p.h rename to src/corelib/text/qstringiterator_p.h diff --git a/src/corelib/tools/qstringlist.cpp b/src/corelib/text/qstringlist.cpp similarity index 100% rename from src/corelib/tools/qstringlist.cpp rename to src/corelib/text/qstringlist.cpp diff --git a/src/corelib/tools/qstringlist.h b/src/corelib/text/qstringlist.h similarity index 100% rename from src/corelib/tools/qstringlist.h rename to src/corelib/text/qstringlist.h diff --git a/src/corelib/tools/qstringliteral.h b/src/corelib/text/qstringliteral.h similarity index 100% rename from src/corelib/tools/qstringliteral.h rename to src/corelib/text/qstringliteral.h diff --git a/src/corelib/tools/qstringmatcher.cpp b/src/corelib/text/qstringmatcher.cpp similarity index 100% rename from src/corelib/tools/qstringmatcher.cpp rename to src/corelib/text/qstringmatcher.cpp diff --git a/src/corelib/tools/qstringmatcher.h b/src/corelib/text/qstringmatcher.h similarity index 100% rename from src/corelib/tools/qstringmatcher.h rename to src/corelib/text/qstringmatcher.h diff --git a/src/corelib/tools/qstringview.cpp b/src/corelib/text/qstringview.cpp similarity index 100% rename from src/corelib/tools/qstringview.cpp rename to src/corelib/text/qstringview.cpp diff --git a/src/corelib/tools/qstringview.h b/src/corelib/text/qstringview.h similarity index 100% rename from src/corelib/tools/qstringview.h rename to src/corelib/text/qstringview.h diff --git a/src/corelib/tools/qt_attribution.json b/src/corelib/text/qt_attribution.json similarity index 100% rename from src/corelib/tools/qt_attribution.json rename to src/corelib/text/qt_attribution.json diff --git a/src/corelib/tools/qtextboundaryfinder.cpp b/src/corelib/text/qtextboundaryfinder.cpp similarity index 100% rename from src/corelib/tools/qtextboundaryfinder.cpp rename to src/corelib/text/qtextboundaryfinder.cpp diff --git a/src/corelib/tools/qtextboundaryfinder.h b/src/corelib/text/qtextboundaryfinder.h similarity index 100% rename from src/corelib/tools/qtextboundaryfinder.h rename to src/corelib/text/qtextboundaryfinder.h diff --git a/src/corelib/tools/qunicodetables.cpp b/src/corelib/text/qunicodetables.cpp similarity index 100% rename from src/corelib/tools/qunicodetables.cpp rename to src/corelib/text/qunicodetables.cpp diff --git a/src/corelib/tools/qunicodetables_p.h b/src/corelib/text/qunicodetables_p.h similarity index 100% rename from src/corelib/tools/qunicodetables_p.h rename to src/corelib/text/qunicodetables_p.h diff --git a/src/corelib/tools/qunicodetools.cpp b/src/corelib/text/qunicodetools.cpp similarity index 100% rename from src/corelib/tools/qunicodetools.cpp rename to src/corelib/text/qunicodetools.cpp diff --git a/src/corelib/tools/qunicodetools_p.h b/src/corelib/text/qunicodetools_p.h similarity index 100% rename from src/corelib/tools/qunicodetools_p.h rename to src/corelib/text/qunicodetools_p.h diff --git a/src/corelib/tools/qvsnprintf.cpp b/src/corelib/text/qvsnprintf.cpp similarity index 100% rename from src/corelib/tools/qvsnprintf.cpp rename to src/corelib/text/qvsnprintf.cpp diff --git a/src/corelib/text/text.pri b/src/corelib/text/text.pri new file mode 100644 index 00000000000..e2796796558 --- /dev/null +++ b/src/corelib/text/text.pri @@ -0,0 +1,100 @@ +# Qt text / string / character / unicode / byte array module + +HEADERS += \ + text/qbytearray.h \ + text/qbytearray_p.h \ + text/qbytearraylist.h \ + text/qbytearraymatcher.h \ + text/qbytedata_p.h \ + text/qchar.h \ + text/qcollator.h \ + text/qcollator_p.h \ + tools/qdoublescanprint_p.h \ + text/qlocale.h \ + text/qlocale_p.h \ + text/qlocale_tools_p.h \ + text/qlocale_data_p.h \ + text/qregexp.h \ + text/qstring.h \ + text/qstringalgorithms.h \ + text/qstringalgorithms_p.h \ + text/qstringbuilder.h \ + text/qstringiterator_p.h \ + text/qstringlist.h \ + text/qstringliteral.h \ + text/qstringmatcher.h \ + text/qstringview.h \ + text/qtextboundaryfinder.h \ + text/qunicodetables_p.h \ + text/qunicodetools_p.h + + +SOURCES += \ + text/qbytearray.cpp \ + text/qbytearraylist.cpp \ + text/qbytearraymatcher.cpp \ + text/qcollator.cpp \ + text/qlocale.cpp \ + text/qlocale_tools.cpp \ + text/qregexp.cpp \ + text/qstring.cpp \ + text/qstringbuilder.cpp \ + text/qstringlist.cpp \ + text/qstringview.cpp \ + text/qtextboundaryfinder.cpp \ + text/qunicodetools.cpp \ + text/qvsnprintf.cpp + +NO_PCH_SOURCES += text/qstring_compat.cpp +false: SOURCES += $$NO_PCH_SOURCES # Hack for QtCreator + +!nacl:macos: { + SOURCES += text/qlocale_mac.mm +} +else:unix { + SOURCES += text/qlocale_unix.cpp +} +else:win32 { + SOURCES += text/qlocale_win.cpp +} else:integrity { + SOURCES += text/qlocale_unix.cpp +} + +qtConfig(icu) { + QMAKE_USE_PRIVATE += icu + + SOURCES += text/qlocale_icu.cpp \ + text/qcollator_icu.cpp +} else: win32 { + SOURCES += text/qcollator_win.cpp +} else: macos { + SOURCES += text/qcollator_macx.cpp +} else { + SOURCES += text/qcollator_posix.cpp +} + +qtConfig(regularexpression) { + QMAKE_USE_PRIVATE += pcre2 + + HEADERS += \ + text/qregularexpression.h + SOURCES += text/qregularexpression.cpp +} + +INCLUDEPATH += ../3rdparty/harfbuzz/src +HEADERS += ../3rdparty/harfbuzz/src/harfbuzz.h +SOURCES += ../3rdparty/harfbuzz/src/harfbuzz-buffer.c \ + ../3rdparty/harfbuzz/src/harfbuzz-gdef.c \ + ../3rdparty/harfbuzz/src/harfbuzz-gsub.c \ + ../3rdparty/harfbuzz/src/harfbuzz-gpos.c \ + ../3rdparty/harfbuzz/src/harfbuzz-impl.c \ + ../3rdparty/harfbuzz/src/harfbuzz-open.c \ + ../3rdparty/harfbuzz/src/harfbuzz-stream.c \ + ../3rdparty/harfbuzz/src/harfbuzz-shaper-all.cpp \ + text/qharfbuzz.cpp +HEADERS += text/qharfbuzz_p.h + +TR_EXCLUDE += ../3rdparty/* + +# MIPS DSP +MIPS_DSP_ASM += text/qstring_mips_dsp_asm.S diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri index 52eddd5d6b4..a2236f90f27 100644 --- a/src/corelib/tools/tools.pri +++ b/src/corelib/tools/tools.pri @@ -8,19 +8,10 @@ HEADERS += \ tools/qarraydataops.h \ tools/qarraydatapointer.h \ tools/qbitarray.h \ - tools/qbytearray.h \ - tools/qbytearray_p.h \ - tools/qbytearraylist.h \ - tools/qbytearraymatcher.h \ - tools/qbytedata_p.h \ tools/qcache.h \ - tools/qchar.h \ - tools/qcollator.h \ - tools/qcollator_p.h \ tools/qcontainerfwd.h \ tools/qcontainertools_impl.h \ tools/qcryptographichash.h \ - tools/qdoublescanprint_p.h \ tools/qeasingcurve.h \ tools/qfreelist_p.h \ tools/qhash.h \ @@ -29,10 +20,6 @@ HEADERS += \ tools/qline.h \ tools/qlinkedlist.h \ tools/qlist.h \ - tools/qlocale.h \ - tools/qlocale_p.h \ - tools/qlocale_tools_p.h \ - tools/qlocale_data_p.h \ tools/qmakearray_p.h \ tools/qmap.h \ tools/qmargins.h \ @@ -43,7 +30,6 @@ HEADERS += \ tools/qpoint.h \ tools/qqueue.h \ tools/qrect.h \ - tools/qregexp.h \ tools/qringbuffer_p.h \ tools/qrefcount.h \ tools/qscopeguard.h \ @@ -57,20 +43,8 @@ HEADERS += \ tools/qsimd_p.h \ tools/qsize.h \ tools/qstack.h \ - tools/qstring.h \ - tools/qstringalgorithms.h \ - tools/qstringalgorithms_p.h \ - tools/qstringbuilder.h \ - tools/qstringiterator_p.h \ - tools/qstringlist.h \ - tools/qstringliteral.h \ - tools/qstringmatcher.h \ - tools/qstringview.h \ - tools/qtextboundaryfinder.h \ tools/qtimeline.h \ tools/qtools_p.h \ - tools/qunicodetables_p.h \ - tools/qunicodetools_p.h \ tools/qvarlengtharray.h \ tools/qvector.h \ tools/qversionnumber.h @@ -79,10 +53,6 @@ HEADERS += \ SOURCES += \ tools/qarraydata.cpp \ tools/qbitarray.cpp \ - tools/qbytearray.cpp \ - tools/qbytearraylist.cpp \ - tools/qbytearraymatcher.cpp \ - tools/qcollator.cpp \ tools/qcryptographichash.cpp \ tools/qeasingcurve.cpp \ tools/qfreelist.cpp \ @@ -90,47 +60,24 @@ SOURCES += \ tools/qline.cpp \ tools/qlinkedlist.cpp \ tools/qlist.cpp \ - tools/qlocale.cpp \ - tools/qlocale_tools.cpp \ tools/qpoint.cpp \ tools/qmap.cpp \ tools/qmargins.cpp \ tools/qmessageauthenticationcode.cpp \ tools/qcontiguouscache.cpp \ tools/qrect.cpp \ - tools/qregexp.cpp \ tools/qrefcount.cpp \ tools/qringbuffer.cpp \ tools/qshareddata.cpp \ tools/qsharedpointer.cpp \ tools/qsimd.cpp \ tools/qsize.cpp \ - tools/qstring.cpp \ - tools/qstringbuilder.cpp \ - tools/qstringlist.cpp \ - tools/qstringview.cpp \ - tools/qtextboundaryfinder.cpp \ tools/qtimeline.cpp \ - tools/qunicodetools.cpp \ - tools/qvsnprintf.cpp \ tools/qversionnumber.cpp -NO_PCH_SOURCES = tools/qstring_compat.cpp msvc: NO_PCH_SOURCES += tools/qvector_msvc.cpp false: SOURCES += $$NO_PCH_SOURCES # Hack for QtCreator -!nacl:mac: { - SOURCES += tools/qlocale_mac.mm -} -else:unix { - SOURCES += tools/qlocale_unix.cpp -} -else:win32 { - SOURCES += tools/qlocale_win.cpp -} else:integrity { - SOURCES += tools/qlocale_unix.cpp -} - qtConfig(system-zlib) { include($$PWD/../../3rdparty/zlib_dependency.pri) } else { @@ -138,27 +85,6 @@ qtConfig(system-zlib) { include($$PWD/../../3rdparty/zlib.pri) } -qtConfig(icu) { - QMAKE_USE_PRIVATE += icu - - SOURCES += tools/qlocale_icu.cpp \ - tools/qcollator_icu.cpp -} else: win32 { - SOURCES += tools/qcollator_win.cpp -} else: macx { - SOURCES += tools/qcollator_macx.cpp -} else { - SOURCES += tools/qcollator_posix.cpp -} - -qtConfig(regularexpression) { - QMAKE_USE_PRIVATE += pcre2 - - HEADERS += \ - tools/qregularexpression.h - SOURCES += tools/qregularexpression.cpp -} - qtConfig(commandlineparser) { HEADERS += \ tools/qcommandlineoption.h \ @@ -168,19 +94,6 @@ qtConfig(commandlineparser) { tools/qcommandlineparser.cpp } -INCLUDEPATH += ../3rdparty/harfbuzz/src -HEADERS += ../3rdparty/harfbuzz/src/harfbuzz.h -SOURCES += ../3rdparty/harfbuzz/src/harfbuzz-buffer.c \ - ../3rdparty/harfbuzz/src/harfbuzz-gdef.c \ - ../3rdparty/harfbuzz/src/harfbuzz-gsub.c \ - ../3rdparty/harfbuzz/src/harfbuzz-gpos.c \ - ../3rdparty/harfbuzz/src/harfbuzz-impl.c \ - ../3rdparty/harfbuzz/src/harfbuzz-open.c \ - ../3rdparty/harfbuzz/src/harfbuzz-stream.c \ - ../3rdparty/harfbuzz/src/harfbuzz-shaper-all.cpp \ - tools/qharfbuzz.cpp -HEADERS += tools/qharfbuzz_p.h - INCLUDEPATH += ../3rdparty/md5 \ ../3rdparty/md4 \ ../3rdparty/sha3 @@ -197,5 +110,4 @@ unix:!macx-icc:!vxworks:!haiku:!integrity:!wasm: LIBS_PRIVATE += -lm TR_EXCLUDE += ../3rdparty/* # MIPS DSP -MIPS_DSP_ASM += tools/qstring_mips_dsp_asm.S MIPS_DSP_HEADERS += ../gui/painting/qt_mips_asm_dsp_p.h diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index 757460393e9..f4d930babb8 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -74,32 +74,32 @@ SOURCES += \ ../../corelib/serialization/qtextstream.cpp \ ../../corelib/serialization/qxmlutils.cpp \ ../../corelib/serialization/qxmlstream.cpp \ + ../../corelib/text/qbytearray.cpp \ + ../../corelib/text/qbytearraymatcher.cpp \ + ../../corelib/text/qlocale.cpp \ + ../../corelib/text/qlocale_tools.cpp \ + ../../corelib/text/qregexp.cpp \ + ../../corelib/text/qstring.cpp \ + ../../corelib/text/qstringbuilder.cpp \ + ../../corelib/text/qstring_compat.cpp \ + ../../corelib/text/qstringlist.cpp \ + ../../corelib/text/qstringview.cpp \ + ../../corelib/text/qvsnprintf.cpp \ ../../corelib/time/qdatetime.cpp \ - ../../corelib/tools/qbitarray.cpp \ - ../../corelib/tools/qbytearray.cpp \ ../../corelib/tools/qarraydata.cpp \ - ../../corelib/tools/qbytearraymatcher.cpp \ + ../../corelib/tools/qbitarray.cpp \ ../../corelib/tools/qcommandlineparser.cpp \ ../../corelib/tools/qcommandlineoption.cpp \ ../../corelib/tools/qcryptographichash.cpp \ ../../corelib/tools/qhash.cpp \ ../../corelib/tools/qlist.cpp \ - ../../corelib/tools/qlocale.cpp \ - ../../corelib/tools/qlocale_tools.cpp \ ../../corelib/tools/qmap.cpp \ - ../../corelib/tools/qregexp.cpp \ ../../corelib/tools/qringbuffer.cpp \ ../../corelib/tools/qpoint.cpp \ ../../corelib/tools/qrect.cpp \ ../../corelib/tools/qsize.cpp \ ../../corelib/tools/qline.cpp \ - ../../corelib/tools/qstring.cpp \ - ../../corelib/tools/qstringbuilder.cpp \ - ../../corelib/tools/qstring_compat.cpp \ - ../../corelib/tools/qstringlist.cpp \ - ../../corelib/tools/qstringview.cpp \ ../../corelib/tools/qversionnumber.cpp \ - ../../corelib/tools/qvsnprintf.cpp \ ../../xml/dom/qdom.cpp \ ../../xml/sax/qxml.cpp diff --git a/tests/auto/corelib/corelib.pro b/tests/auto/corelib/corelib.pro index 1d76e1549be..d696e174aaa 100644 --- a/tests/auto/corelib/corelib.pro +++ b/tests/auto/corelib/corelib.pro @@ -13,6 +13,7 @@ SUBDIRS = \ plugin \ serialization \ statemachine \ + text \ thread \ time \ tools diff --git a/tests/auto/corelib/tools/qbytearray/.gitattributes b/tests/auto/corelib/text/qbytearray/.gitattributes similarity index 100% rename from tests/auto/corelib/tools/qbytearray/.gitattributes rename to tests/auto/corelib/text/qbytearray/.gitattributes diff --git a/tests/auto/corelib/tools/qbytearray/.gitignore b/tests/auto/corelib/text/qbytearray/.gitignore similarity index 100% rename from tests/auto/corelib/tools/qbytearray/.gitignore rename to tests/auto/corelib/text/qbytearray/.gitignore diff --git a/tests/auto/corelib/tools/qbytearray/android_testdata.qrc b/tests/auto/corelib/text/qbytearray/android_testdata.qrc similarity index 100% rename from tests/auto/corelib/tools/qbytearray/android_testdata.qrc rename to tests/auto/corelib/text/qbytearray/android_testdata.qrc diff --git a/tests/auto/corelib/tools/qbytearray/qbytearray.pro b/tests/auto/corelib/text/qbytearray/qbytearray.pro similarity index 100% rename from tests/auto/corelib/tools/qbytearray/qbytearray.pro rename to tests/auto/corelib/text/qbytearray/qbytearray.pro diff --git a/tests/auto/corelib/tools/qbytearray/rfc3252.txt b/tests/auto/corelib/text/qbytearray/rfc3252.txt similarity index 100% rename from tests/auto/corelib/tools/qbytearray/rfc3252.txt rename to tests/auto/corelib/text/qbytearray/rfc3252.txt diff --git a/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp b/tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp similarity index 100% rename from tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp rename to tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp diff --git a/tests/auto/corelib/tools/qbytearray/tst_qbytearray_mac.mm b/tests/auto/corelib/text/qbytearray/tst_qbytearray_mac.mm similarity index 100% rename from tests/auto/corelib/tools/qbytearray/tst_qbytearray_mac.mm rename to tests/auto/corelib/text/qbytearray/tst_qbytearray_mac.mm diff --git a/tests/auto/corelib/tools/qbytearraylist/qbytearraylist.pro b/tests/auto/corelib/text/qbytearraylist/qbytearraylist.pro similarity index 100% rename from tests/auto/corelib/tools/qbytearraylist/qbytearraylist.pro rename to tests/auto/corelib/text/qbytearraylist/qbytearraylist.pro diff --git a/tests/auto/corelib/tools/qbytearraylist/tst_qbytearraylist.cpp b/tests/auto/corelib/text/qbytearraylist/tst_qbytearraylist.cpp similarity index 100% rename from tests/auto/corelib/tools/qbytearraylist/tst_qbytearraylist.cpp rename to tests/auto/corelib/text/qbytearraylist/tst_qbytearraylist.cpp diff --git a/tests/auto/corelib/tools/qbytearraymatcher/qbytearraymatcher.pro b/tests/auto/corelib/text/qbytearraymatcher/qbytearraymatcher.pro similarity index 100% rename from tests/auto/corelib/tools/qbytearraymatcher/qbytearraymatcher.pro rename to tests/auto/corelib/text/qbytearraymatcher/qbytearraymatcher.pro diff --git a/tests/auto/corelib/tools/qbytearraymatcher/tst_qbytearraymatcher.cpp b/tests/auto/corelib/text/qbytearraymatcher/tst_qbytearraymatcher.cpp similarity index 100% rename from tests/auto/corelib/tools/qbytearraymatcher/tst_qbytearraymatcher.cpp rename to tests/auto/corelib/text/qbytearraymatcher/tst_qbytearraymatcher.cpp diff --git a/tests/auto/corelib/tools/qbytedatabuffer/.gitignore b/tests/auto/corelib/text/qbytedatabuffer/.gitignore similarity index 100% rename from tests/auto/corelib/tools/qbytedatabuffer/.gitignore rename to tests/auto/corelib/text/qbytedatabuffer/.gitignore diff --git a/tests/auto/corelib/tools/qbytedatabuffer/qbytedatabuffer.pro b/tests/auto/corelib/text/qbytedatabuffer/qbytedatabuffer.pro similarity index 100% rename from tests/auto/corelib/tools/qbytedatabuffer/qbytedatabuffer.pro rename to tests/auto/corelib/text/qbytedatabuffer/qbytedatabuffer.pro diff --git a/tests/auto/corelib/tools/qbytedatabuffer/tst_qbytedatabuffer.cpp b/tests/auto/corelib/text/qbytedatabuffer/tst_qbytedatabuffer.cpp similarity index 100% rename from tests/auto/corelib/tools/qbytedatabuffer/tst_qbytedatabuffer.cpp rename to tests/auto/corelib/text/qbytedatabuffer/tst_qbytedatabuffer.cpp diff --git a/tests/auto/corelib/tools/qchar/.gitignore b/tests/auto/corelib/text/qchar/.gitignore similarity index 100% rename from tests/auto/corelib/tools/qchar/.gitignore rename to tests/auto/corelib/text/qchar/.gitignore diff --git a/tests/auto/corelib/tools/qchar/data/NormalizationTest.txt b/tests/auto/corelib/text/qchar/data/NormalizationTest.txt similarity index 100% rename from tests/auto/corelib/tools/qchar/data/NormalizationTest.txt rename to tests/auto/corelib/text/qchar/data/NormalizationTest.txt diff --git a/tests/auto/corelib/tools/qchar/qchar.pro b/tests/auto/corelib/text/qchar/qchar.pro similarity index 100% rename from tests/auto/corelib/tools/qchar/qchar.pro rename to tests/auto/corelib/text/qchar/qchar.pro diff --git a/tests/auto/corelib/tools/qchar/testdata.qrc b/tests/auto/corelib/text/qchar/testdata.qrc similarity index 100% rename from tests/auto/corelib/tools/qchar/testdata.qrc rename to tests/auto/corelib/text/qchar/testdata.qrc diff --git a/tests/auto/corelib/tools/qchar/tst_qchar.cpp b/tests/auto/corelib/text/qchar/tst_qchar.cpp similarity index 100% rename from tests/auto/corelib/tools/qchar/tst_qchar.cpp rename to tests/auto/corelib/text/qchar/tst_qchar.cpp diff --git a/tests/auto/corelib/tools/qcollator/qcollator.pro b/tests/auto/corelib/text/qcollator/qcollator.pro similarity index 100% rename from tests/auto/corelib/tools/qcollator/qcollator.pro rename to tests/auto/corelib/text/qcollator/qcollator.pro diff --git a/tests/auto/corelib/tools/qcollator/tst_qcollator.cpp b/tests/auto/corelib/text/qcollator/tst_qcollator.cpp similarity index 100% rename from tests/auto/corelib/tools/qcollator/tst_qcollator.cpp rename to tests/auto/corelib/text/qcollator/tst_qcollator.cpp diff --git a/tests/auto/corelib/tools/qlatin1string/.gitignore b/tests/auto/corelib/text/qlatin1string/.gitignore similarity index 100% rename from tests/auto/corelib/tools/qlatin1string/.gitignore rename to tests/auto/corelib/text/qlatin1string/.gitignore diff --git a/tests/auto/corelib/tools/qlatin1string/qlatin1string.pro b/tests/auto/corelib/text/qlatin1string/qlatin1string.pro similarity index 100% rename from tests/auto/corelib/tools/qlatin1string/qlatin1string.pro rename to tests/auto/corelib/text/qlatin1string/qlatin1string.pro diff --git a/tests/auto/corelib/tools/qlatin1string/tst_qlatin1string.cpp b/tests/auto/corelib/text/qlatin1string/tst_qlatin1string.cpp similarity index 100% rename from tests/auto/corelib/tools/qlatin1string/tst_qlatin1string.cpp rename to tests/auto/corelib/text/qlatin1string/tst_qlatin1string.cpp diff --git a/tests/auto/corelib/tools/qlocale/.gitignore b/tests/auto/corelib/text/qlocale/.gitignore similarity index 100% rename from tests/auto/corelib/tools/qlocale/.gitignore rename to tests/auto/corelib/text/qlocale/.gitignore diff --git a/tests/auto/corelib/tools/qlocale/qlocale.pro b/tests/auto/corelib/text/qlocale/qlocale.pro similarity index 100% rename from tests/auto/corelib/tools/qlocale/qlocale.pro rename to tests/auto/corelib/text/qlocale/qlocale.pro diff --git a/tests/auto/corelib/tools/qlocale/syslocaleapp/syslocaleapp.cpp b/tests/auto/corelib/text/qlocale/syslocaleapp/syslocaleapp.cpp similarity index 100% rename from tests/auto/corelib/tools/qlocale/syslocaleapp/syslocaleapp.cpp rename to tests/auto/corelib/text/qlocale/syslocaleapp/syslocaleapp.cpp diff --git a/tests/auto/corelib/tools/qlocale/syslocaleapp/syslocaleapp.pro b/tests/auto/corelib/text/qlocale/syslocaleapp/syslocaleapp.pro similarity index 100% rename from tests/auto/corelib/tools/qlocale/syslocaleapp/syslocaleapp.pro rename to tests/auto/corelib/text/qlocale/syslocaleapp/syslocaleapp.pro diff --git a/tests/auto/corelib/tools/qlocale/test/test.pro b/tests/auto/corelib/text/qlocale/test/test.pro similarity index 100% rename from tests/auto/corelib/tools/qlocale/test/test.pro rename to tests/auto/corelib/text/qlocale/test/test.pro diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp similarity index 100% rename from tests/auto/corelib/tools/qlocale/tst_qlocale.cpp rename to tests/auto/corelib/text/qlocale/tst_qlocale.cpp diff --git a/tests/auto/corelib/tools/qregexp/.gitignore b/tests/auto/corelib/text/qregexp/.gitignore similarity index 100% rename from tests/auto/corelib/tools/qregexp/.gitignore rename to tests/auto/corelib/text/qregexp/.gitignore diff --git a/tests/auto/corelib/tools/qregexp/qregexp.pro b/tests/auto/corelib/text/qregexp/qregexp.pro similarity index 100% rename from tests/auto/corelib/tools/qregexp/qregexp.pro rename to tests/auto/corelib/text/qregexp/qregexp.pro diff --git a/tests/auto/corelib/tools/qregexp/tst_qregexp.cpp b/tests/auto/corelib/text/qregexp/tst_qregexp.cpp similarity index 100% rename from tests/auto/corelib/tools/qregexp/tst_qregexp.cpp rename to tests/auto/corelib/text/qregexp/tst_qregexp.cpp diff --git a/tests/auto/corelib/tools/qregularexpression/.gitignore b/tests/auto/corelib/text/qregularexpression/.gitignore similarity index 100% rename from tests/auto/corelib/tools/qregularexpression/.gitignore rename to tests/auto/corelib/text/qregularexpression/.gitignore diff --git a/tests/auto/corelib/tools/qregularexpression/qregularexpression.pro b/tests/auto/corelib/text/qregularexpression/qregularexpression.pro similarity index 100% rename from tests/auto/corelib/tools/qregularexpression/qregularexpression.pro rename to tests/auto/corelib/text/qregularexpression/qregularexpression.pro diff --git a/tests/auto/corelib/tools/qregularexpression/tst_qregularexpression.cpp b/tests/auto/corelib/text/qregularexpression/tst_qregularexpression.cpp similarity index 100% rename from tests/auto/corelib/tools/qregularexpression/tst_qregularexpression.cpp rename to tests/auto/corelib/text/qregularexpression/tst_qregularexpression.cpp diff --git a/tests/auto/corelib/tools/qstring/.gitignore b/tests/auto/corelib/text/qstring/.gitignore similarity index 100% rename from tests/auto/corelib/tools/qstring/.gitignore rename to tests/auto/corelib/text/qstring/.gitignore diff --git a/tests/auto/corelib/tools/qstring/double_data.h b/tests/auto/corelib/text/qstring/double_data.h similarity index 100% rename from tests/auto/corelib/tools/qstring/double_data.h rename to tests/auto/corelib/text/qstring/double_data.h diff --git a/tests/auto/corelib/tools/qstring/qstring.pro b/tests/auto/corelib/text/qstring/qstring.pro similarity index 100% rename from tests/auto/corelib/tools/qstring/qstring.pro rename to tests/auto/corelib/text/qstring/qstring.pro diff --git a/tests/auto/corelib/tools/qstring/tst_qstring.cpp b/tests/auto/corelib/text/qstring/tst_qstring.cpp similarity index 100% rename from tests/auto/corelib/tools/qstring/tst_qstring.cpp rename to tests/auto/corelib/text/qstring/tst_qstring.cpp diff --git a/tests/auto/corelib/tools/qstring/tst_qstring_mac.mm b/tests/auto/corelib/text/qstring/tst_qstring_mac.mm similarity index 100% rename from tests/auto/corelib/tools/qstring/tst_qstring_mac.mm rename to tests/auto/corelib/text/qstring/tst_qstring_mac.mm diff --git a/tests/auto/corelib/tools/qstring_no_cast_from_bytearray/qstring_no_cast_from_bytearray.pro b/tests/auto/corelib/text/qstring_no_cast_from_bytearray/qstring_no_cast_from_bytearray.pro similarity index 100% rename from tests/auto/corelib/tools/qstring_no_cast_from_bytearray/qstring_no_cast_from_bytearray.pro rename to tests/auto/corelib/text/qstring_no_cast_from_bytearray/qstring_no_cast_from_bytearray.pro diff --git a/tests/auto/corelib/tools/qstring_no_cast_from_bytearray/tst_qstring_no_cast_from_bytearray.cpp b/tests/auto/corelib/text/qstring_no_cast_from_bytearray/tst_qstring_no_cast_from_bytearray.cpp similarity index 100% rename from tests/auto/corelib/tools/qstring_no_cast_from_bytearray/tst_qstring_no_cast_from_bytearray.cpp rename to tests/auto/corelib/text/qstring_no_cast_from_bytearray/tst_qstring_no_cast_from_bytearray.cpp diff --git a/tests/auto/corelib/tools/qstringapisymmetry/.gitignore b/tests/auto/corelib/text/qstringapisymmetry/.gitignore similarity index 100% rename from tests/auto/corelib/tools/qstringapisymmetry/.gitignore rename to tests/auto/corelib/text/qstringapisymmetry/.gitignore diff --git a/tests/auto/corelib/tools/qstringapisymmetry/qstringapisymmetry.pro b/tests/auto/corelib/text/qstringapisymmetry/qstringapisymmetry.pro similarity index 100% rename from tests/auto/corelib/tools/qstringapisymmetry/qstringapisymmetry.pro rename to tests/auto/corelib/text/qstringapisymmetry/qstringapisymmetry.pro diff --git a/tests/auto/corelib/tools/qstringapisymmetry/tst_qstringapisymmetry.cpp b/tests/auto/corelib/text/qstringapisymmetry/tst_qstringapisymmetry.cpp similarity index 100% rename from tests/auto/corelib/tools/qstringapisymmetry/tst_qstringapisymmetry.cpp rename to tests/auto/corelib/text/qstringapisymmetry/tst_qstringapisymmetry.cpp diff --git a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder.pro b/tests/auto/corelib/text/qstringbuilder/qstringbuilder.pro similarity index 100% rename from tests/auto/corelib/tools/qstringbuilder/qstringbuilder.pro rename to tests/auto/corelib/text/qstringbuilder/qstringbuilder.pro diff --git a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/qstringbuilder1.pro b/tests/auto/corelib/text/qstringbuilder/qstringbuilder1/qstringbuilder1.pro similarity index 100% rename from tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/qstringbuilder1.pro rename to tests/auto/corelib/text/qstringbuilder/qstringbuilder1/qstringbuilder1.pro diff --git a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/stringbuilder.cpp b/tests/auto/corelib/text/qstringbuilder/qstringbuilder1/stringbuilder.cpp similarity index 100% rename from tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/stringbuilder.cpp rename to tests/auto/corelib/text/qstringbuilder/qstringbuilder1/stringbuilder.cpp diff --git a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/tst_qstringbuilder1.cpp b/tests/auto/corelib/text/qstringbuilder/qstringbuilder1/tst_qstringbuilder1.cpp similarity index 100% rename from tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/tst_qstringbuilder1.cpp rename to tests/auto/corelib/text/qstringbuilder/qstringbuilder1/tst_qstringbuilder1.cpp diff --git a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder2/qstringbuilder2.pro b/tests/auto/corelib/text/qstringbuilder/qstringbuilder2/qstringbuilder2.pro similarity index 100% rename from tests/auto/corelib/tools/qstringbuilder/qstringbuilder2/qstringbuilder2.pro rename to tests/auto/corelib/text/qstringbuilder/qstringbuilder2/qstringbuilder2.pro diff --git a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder2/tst_qstringbuilder2.cpp b/tests/auto/corelib/text/qstringbuilder/qstringbuilder2/tst_qstringbuilder2.cpp similarity index 100% rename from tests/auto/corelib/tools/qstringbuilder/qstringbuilder2/tst_qstringbuilder2.cpp rename to tests/auto/corelib/text/qstringbuilder/qstringbuilder2/tst_qstringbuilder2.cpp diff --git a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder3/qstringbuilder3.pro b/tests/auto/corelib/text/qstringbuilder/qstringbuilder3/qstringbuilder3.pro similarity index 100% rename from tests/auto/corelib/tools/qstringbuilder/qstringbuilder3/qstringbuilder3.pro rename to tests/auto/corelib/text/qstringbuilder/qstringbuilder3/qstringbuilder3.pro diff --git a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder3/tst_qstringbuilder3.cpp b/tests/auto/corelib/text/qstringbuilder/qstringbuilder3/tst_qstringbuilder3.cpp similarity index 100% rename from tests/auto/corelib/tools/qstringbuilder/qstringbuilder3/tst_qstringbuilder3.cpp rename to tests/auto/corelib/text/qstringbuilder/qstringbuilder3/tst_qstringbuilder3.cpp diff --git a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder4/qstringbuilder4.pro b/tests/auto/corelib/text/qstringbuilder/qstringbuilder4/qstringbuilder4.pro similarity index 100% rename from tests/auto/corelib/tools/qstringbuilder/qstringbuilder4/qstringbuilder4.pro rename to tests/auto/corelib/text/qstringbuilder/qstringbuilder4/qstringbuilder4.pro diff --git a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder4/tst_qstringbuilder4.cpp b/tests/auto/corelib/text/qstringbuilder/qstringbuilder4/tst_qstringbuilder4.cpp similarity index 100% rename from tests/auto/corelib/tools/qstringbuilder/qstringbuilder4/tst_qstringbuilder4.cpp rename to tests/auto/corelib/text/qstringbuilder/qstringbuilder4/tst_qstringbuilder4.cpp diff --git a/tests/auto/corelib/tools/qstringiterator/qstringiterator.pro b/tests/auto/corelib/text/qstringiterator/qstringiterator.pro similarity index 100% rename from tests/auto/corelib/tools/qstringiterator/qstringiterator.pro rename to tests/auto/corelib/text/qstringiterator/qstringiterator.pro diff --git a/tests/auto/corelib/tools/qstringiterator/tst_qstringiterator.cpp b/tests/auto/corelib/text/qstringiterator/tst_qstringiterator.cpp similarity index 100% rename from tests/auto/corelib/tools/qstringiterator/tst_qstringiterator.cpp rename to tests/auto/corelib/text/qstringiterator/tst_qstringiterator.cpp diff --git a/tests/auto/corelib/tools/qstringlist/.gitignore b/tests/auto/corelib/text/qstringlist/.gitignore similarity index 100% rename from tests/auto/corelib/tools/qstringlist/.gitignore rename to tests/auto/corelib/text/qstringlist/.gitignore diff --git a/tests/auto/corelib/tools/qstringlist/qstringlist.pro b/tests/auto/corelib/text/qstringlist/qstringlist.pro similarity index 100% rename from tests/auto/corelib/tools/qstringlist/qstringlist.pro rename to tests/auto/corelib/text/qstringlist/qstringlist.pro diff --git a/tests/auto/corelib/tools/qstringlist/tst_qstringlist.cpp b/tests/auto/corelib/text/qstringlist/tst_qstringlist.cpp similarity index 100% rename from tests/auto/corelib/tools/qstringlist/tst_qstringlist.cpp rename to tests/auto/corelib/text/qstringlist/tst_qstringlist.cpp diff --git a/tests/auto/corelib/tools/qstringmatcher/.gitignore b/tests/auto/corelib/text/qstringmatcher/.gitignore similarity index 100% rename from tests/auto/corelib/tools/qstringmatcher/.gitignore rename to tests/auto/corelib/text/qstringmatcher/.gitignore diff --git a/tests/auto/corelib/tools/qstringmatcher/qstringmatcher.pro b/tests/auto/corelib/text/qstringmatcher/qstringmatcher.pro similarity index 100% rename from tests/auto/corelib/tools/qstringmatcher/qstringmatcher.pro rename to tests/auto/corelib/text/qstringmatcher/qstringmatcher.pro diff --git a/tests/auto/corelib/tools/qstringmatcher/tst_qstringmatcher.cpp b/tests/auto/corelib/text/qstringmatcher/tst_qstringmatcher.cpp similarity index 100% rename from tests/auto/corelib/tools/qstringmatcher/tst_qstringmatcher.cpp rename to tests/auto/corelib/text/qstringmatcher/tst_qstringmatcher.cpp diff --git a/tests/auto/corelib/tools/qstringref/qstringref.pro b/tests/auto/corelib/text/qstringref/qstringref.pro similarity index 100% rename from tests/auto/corelib/tools/qstringref/qstringref.pro rename to tests/auto/corelib/text/qstringref/qstringref.pro diff --git a/tests/auto/corelib/tools/qstringref/tst_qstringref.cpp b/tests/auto/corelib/text/qstringref/tst_qstringref.cpp similarity index 100% rename from tests/auto/corelib/tools/qstringref/tst_qstringref.cpp rename to tests/auto/corelib/text/qstringref/tst_qstringref.cpp diff --git a/tests/auto/corelib/tools/qstringview/.gitignore b/tests/auto/corelib/text/qstringview/.gitignore similarity index 100% rename from tests/auto/corelib/tools/qstringview/.gitignore rename to tests/auto/corelib/text/qstringview/.gitignore diff --git a/tests/auto/corelib/tools/qstringview/qstringview.pro b/tests/auto/corelib/text/qstringview/qstringview.pro similarity index 100% rename from tests/auto/corelib/tools/qstringview/qstringview.pro rename to tests/auto/corelib/text/qstringview/qstringview.pro diff --git a/tests/auto/corelib/tools/qstringview/tst_qstringview.cpp b/tests/auto/corelib/text/qstringview/tst_qstringview.cpp similarity index 100% rename from tests/auto/corelib/tools/qstringview/tst_qstringview.cpp rename to tests/auto/corelib/text/qstringview/tst_qstringview.cpp diff --git a/tests/auto/corelib/tools/qtextboundaryfinder/.gitignore b/tests/auto/corelib/text/qtextboundaryfinder/.gitignore similarity index 100% rename from tests/auto/corelib/tools/qtextboundaryfinder/.gitignore rename to tests/auto/corelib/text/qtextboundaryfinder/.gitignore diff --git a/tests/auto/corelib/tools/qtextboundaryfinder/data/GraphemeBreakTest.txt b/tests/auto/corelib/text/qtextboundaryfinder/data/GraphemeBreakTest.txt similarity index 100% rename from tests/auto/corelib/tools/qtextboundaryfinder/data/GraphemeBreakTest.txt rename to tests/auto/corelib/text/qtextboundaryfinder/data/GraphemeBreakTest.txt diff --git a/tests/auto/corelib/tools/qtextboundaryfinder/data/LineBreakTest.txt b/tests/auto/corelib/text/qtextboundaryfinder/data/LineBreakTest.txt similarity index 100% rename from tests/auto/corelib/tools/qtextboundaryfinder/data/LineBreakTest.txt rename to tests/auto/corelib/text/qtextboundaryfinder/data/LineBreakTest.txt diff --git a/tests/auto/corelib/tools/qtextboundaryfinder/data/SentenceBreakTest.txt b/tests/auto/corelib/text/qtextboundaryfinder/data/SentenceBreakTest.txt similarity index 100% rename from tests/auto/corelib/tools/qtextboundaryfinder/data/SentenceBreakTest.txt rename to tests/auto/corelib/text/qtextboundaryfinder/data/SentenceBreakTest.txt diff --git a/tests/auto/corelib/tools/qtextboundaryfinder/data/WordBreakTest.txt b/tests/auto/corelib/text/qtextboundaryfinder/data/WordBreakTest.txt similarity index 100% rename from tests/auto/corelib/tools/qtextboundaryfinder/data/WordBreakTest.txt rename to tests/auto/corelib/text/qtextboundaryfinder/data/WordBreakTest.txt diff --git a/tests/auto/corelib/tools/qtextboundaryfinder/qtextboundaryfinder.pro b/tests/auto/corelib/text/qtextboundaryfinder/qtextboundaryfinder.pro similarity index 100% rename from tests/auto/corelib/tools/qtextboundaryfinder/qtextboundaryfinder.pro rename to tests/auto/corelib/text/qtextboundaryfinder/qtextboundaryfinder.pro diff --git a/tests/auto/corelib/tools/qtextboundaryfinder/testdata.qrc b/tests/auto/corelib/text/qtextboundaryfinder/testdata.qrc similarity index 100% rename from tests/auto/corelib/tools/qtextboundaryfinder/testdata.qrc rename to tests/auto/corelib/text/qtextboundaryfinder/testdata.qrc diff --git a/tests/auto/corelib/tools/qtextboundaryfinder/tst_qtextboundaryfinder.cpp b/tests/auto/corelib/text/qtextboundaryfinder/tst_qtextboundaryfinder.cpp similarity index 100% rename from tests/auto/corelib/tools/qtextboundaryfinder/tst_qtextboundaryfinder.cpp rename to tests/auto/corelib/text/qtextboundaryfinder/tst_qtextboundaryfinder.cpp diff --git a/tests/auto/corelib/text/text.pro b/tests/auto/corelib/text/text.pro new file mode 100644 index 00000000000..09d58bd74cd --- /dev/null +++ b/tests/auto/corelib/text/text.pro @@ -0,0 +1,23 @@ +TEMPLATE = subdirs + +SUBDIRS = \ + qbytearray \ + qbytearraylist \ + qbytearraymatcher \ + qbytedatabuffer \ + qchar \ + qcollator \ + qlatin1string \ + qlocale \ + qregexp \ + qregularexpression \ + qstring \ + qstring_no_cast_from_bytearray \ + qstringapisymmetry \ + qstringbuilder \ + qstringiterator \ + qstringlist \ + qstringmatcher \ + qstringref \ + qstringview \ + qtextboundaryfinder diff --git a/tests/auto/corelib/tools/tools.pro b/tests/auto/corelib/tools/tools.pro index 243e7e96f52..49b2a1f075d 100644 --- a/tests/auto/corelib/tools/tools.pro +++ b/tests/auto/corelib/tools/tools.pro @@ -6,13 +6,7 @@ SUBDIRS=\ qarraydata \ qarraydata_strictiterators \ qbitarray \ - qbytearray \ - qbytearraylist \ - qbytearraymatcher \ - qbytedatabuffer \ qcache \ - qchar \ - qcollator \ qcommandlineparser \ qcontiguouscache \ qcryptographichash \ @@ -22,12 +16,10 @@ SUBDIRS=\ qhash \ qhash_strictiterators \ qhashfunctions \ - qlatin1string \ qline \ qlinkedlist \ qlist \ qlist_strictiterators \ - qlocale \ qmakearray \ qmap \ qmap_strictiterators \ @@ -39,8 +31,6 @@ SUBDIRS=\ qpointf \ qqueue \ qrect \ - qregexp \ - qregularexpression \ qringbuffer \ qscopedpointer \ qscopedvaluerollback \ @@ -50,16 +40,6 @@ SUBDIRS=\ qsize \ qsizef \ qstl \ - qstring \ - qstring_no_cast_from_bytearray \ - qstringapisymmetry \ - qstringbuilder \ - qstringiterator \ - qstringlist \ - qstringmatcher \ - qstringref \ - qstringview \ - qtextboundaryfinder \ qtimeline \ qvarlengtharray \ qvector \ diff --git a/tests/benchmarks/corelib/corelib.pro b/tests/benchmarks/corelib/corelib.pro index 99af4c138fa..010abd7751d 100644 --- a/tests/benchmarks/corelib/corelib.pro +++ b/tests/benchmarks/corelib/corelib.pro @@ -4,6 +4,7 @@ SUBDIRS = \ json \ mimetypes \ kernel \ + text \ thread \ time \ tools \ diff --git a/tests/benchmarks/corelib/tools/qbytearray/main.cpp b/tests/benchmarks/corelib/text/qbytearray/main.cpp similarity index 100% rename from tests/benchmarks/corelib/tools/qbytearray/main.cpp rename to tests/benchmarks/corelib/text/qbytearray/main.cpp diff --git a/tests/benchmarks/corelib/tools/qbytearray/qbytearray.pro b/tests/benchmarks/corelib/text/qbytearray/qbytearray.pro similarity index 100% rename from tests/benchmarks/corelib/tools/qbytearray/qbytearray.pro rename to tests/benchmarks/corelib/text/qbytearray/qbytearray.pro diff --git a/tests/benchmarks/corelib/tools/qchar/main.cpp b/tests/benchmarks/corelib/text/qchar/main.cpp similarity index 100% rename from tests/benchmarks/corelib/tools/qchar/main.cpp rename to tests/benchmarks/corelib/text/qchar/main.cpp diff --git a/tests/benchmarks/corelib/tools/qchar/qchar.pro b/tests/benchmarks/corelib/text/qchar/qchar.pro similarity index 100% rename from tests/benchmarks/corelib/tools/qchar/qchar.pro rename to tests/benchmarks/corelib/text/qchar/qchar.pro diff --git a/tests/benchmarks/corelib/tools/qlocale/main.cpp b/tests/benchmarks/corelib/text/qlocale/main.cpp similarity index 100% rename from tests/benchmarks/corelib/tools/qlocale/main.cpp rename to tests/benchmarks/corelib/text/qlocale/main.cpp diff --git a/tests/benchmarks/corelib/tools/qlocale/qlocale.pro b/tests/benchmarks/corelib/text/qlocale/qlocale.pro similarity index 100% rename from tests/benchmarks/corelib/tools/qlocale/qlocale.pro rename to tests/benchmarks/corelib/text/qlocale/qlocale.pro diff --git a/tests/benchmarks/corelib/tools/qregexp/main.cpp b/tests/benchmarks/corelib/text/qregexp/main.cpp similarity index 100% rename from tests/benchmarks/corelib/tools/qregexp/main.cpp rename to tests/benchmarks/corelib/text/qregexp/main.cpp diff --git a/tests/benchmarks/corelib/tools/qregexp/qregexp.pro b/tests/benchmarks/corelib/text/qregexp/qregexp.pro similarity index 100% rename from tests/benchmarks/corelib/tools/qregexp/qregexp.pro rename to tests/benchmarks/corelib/text/qregexp/qregexp.pro diff --git a/tests/benchmarks/corelib/tools/qregexp/qregexp.qrc b/tests/benchmarks/corelib/text/qregexp/qregexp.qrc similarity index 100% rename from tests/benchmarks/corelib/tools/qregexp/qregexp.qrc rename to tests/benchmarks/corelib/text/qregexp/qregexp.qrc diff --git a/tests/benchmarks/corelib/tools/qstring/main.cpp b/tests/benchmarks/corelib/text/qstring/main.cpp similarity index 100% rename from tests/benchmarks/corelib/tools/qstring/main.cpp rename to tests/benchmarks/corelib/text/qstring/main.cpp diff --git a/tests/benchmarks/corelib/tools/qstring/qstring.pro b/tests/benchmarks/corelib/text/qstring/qstring.pro similarity index 100% rename from tests/benchmarks/corelib/tools/qstring/qstring.pro rename to tests/benchmarks/corelib/text/qstring/qstring.pro diff --git a/tests/benchmarks/corelib/tools/qstringbuilder/main.cpp b/tests/benchmarks/corelib/text/qstringbuilder/main.cpp similarity index 100% rename from tests/benchmarks/corelib/tools/qstringbuilder/main.cpp rename to tests/benchmarks/corelib/text/qstringbuilder/main.cpp diff --git a/tests/benchmarks/corelib/tools/qstringbuilder/qstringbuilder.pro b/tests/benchmarks/corelib/text/qstringbuilder/qstringbuilder.pro similarity index 100% rename from tests/benchmarks/corelib/tools/qstringbuilder/qstringbuilder.pro rename to tests/benchmarks/corelib/text/qstringbuilder/qstringbuilder.pro diff --git a/tests/benchmarks/corelib/tools/qstringlist/.gitignore b/tests/benchmarks/corelib/text/qstringlist/.gitignore similarity index 100% rename from tests/benchmarks/corelib/tools/qstringlist/.gitignore rename to tests/benchmarks/corelib/text/qstringlist/.gitignore diff --git a/tests/benchmarks/corelib/tools/qstringlist/main.cpp b/tests/benchmarks/corelib/text/qstringlist/main.cpp similarity index 100% rename from tests/benchmarks/corelib/tools/qstringlist/main.cpp rename to tests/benchmarks/corelib/text/qstringlist/main.cpp diff --git a/tests/benchmarks/corelib/tools/qstringlist/qstringlist.pro b/tests/benchmarks/corelib/text/qstringlist/qstringlist.pro similarity index 100% rename from tests/benchmarks/corelib/tools/qstringlist/qstringlist.pro rename to tests/benchmarks/corelib/text/qstringlist/qstringlist.pro diff --git a/tests/benchmarks/corelib/text/text.pro b/tests/benchmarks/corelib/text/text.pro new file mode 100644 index 00000000000..8c15d0b0c5d --- /dev/null +++ b/tests/benchmarks/corelib/text/text.pro @@ -0,0 +1,10 @@ +TEMPLATE = subdirs +SUBDIRS = \ + qbytearray \ + qchar \ + qlocale \ + qregexp \ + qstringbuilder \ + qstringlist + +*g++*: SUBDIRS += qstring diff --git a/tests/benchmarks/corelib/tools/qhash/paths_small_data.txt b/tests/benchmarks/corelib/tools/qhash/paths_small_data.txt index d5acd288203..662285296f7 100644 --- a/tests/benchmarks/corelib/tools/qhash/paths_small_data.txt +++ b/tests/benchmarks/corelib/tools/qhash/paths_small_data.txt @@ -47,13 +47,38 @@ ./codecs/.obj/debug-shared ./.pch ./.pch/debug-shared +./text +./text/text.pro +./text/qregexp +./text/qregexp/qregexp.qrc +./text/qregexp/main.cpp +./text/qregexp/Makefile +./text/qregexp/qregexp.pro +./text/qstringbuilder +./text/qstringbuilder/main.cpp +./text/qstringbuilder/Makefile +./text/qstringbuilder/qstringbuilder.pro +./text/qstring +./text/qstring/generatelist.pl +./text/qstring/data.h +./text/qstring/qstring.pro +./text/qstring/main.cpp +./text/qstring/data.cpp +./text/qstring/Makefile +./text/qstring/utf-8.txt +./text/qstringlist +./text/qstringlist/qstringlist.pro +./text/qstringlist/main.cpp +./text/qstringlist/.gitignore +./text/qstringlist/Makefile +./text/qbytearray +./text/qbytearray/qbytearray.pro +./text/qbytearray/main.cpp +./text/qbytearray/Makefile +./text/.pch +./text/.pch/debug-shared ./tools ./tools/tools.pro -./tools/qregexp -./tools/qregexp/qregexp.qrc -./tools/qregexp/main.cpp -./tools/qregexp/Makefile -./tools/qregexp/qregexp.pro ./tools/qvector ./tools/qvector/tst_vector ./tools/qvector/.pch @@ -72,31 +97,10 @@ ./tools/qvector/qvector.pro ./tools/.pch ./tools/.pch/debug-shared -./tools/qstringbuilder -./tools/qstringbuilder/main.cpp -./tools/qstringbuilder/Makefile -./tools/qstringbuilder/qstringbuilder.pro ./tools/containers-sequential ./tools/containers-sequential/containers-sequential.pro ./tools/containers-sequential/main.cpp ./tools/containers-sequential/Makefile -./tools/qstring -./tools/qstring/generatelist.pl -./tools/qstring/data.h -./tools/qstring/qstring.pro -./tools/qstring/main.cpp -./tools/qstring/data.cpp -./tools/qstring/Makefile -./tools/qstring/utf-8.txt -./tools/qstringlist -./tools/qstringlist/qstringlist.pro -./tools/qstringlist/main.cpp -./tools/qstringlist/.gitignore -./tools/qstringlist/Makefile -./tools/qbytearray -./tools/qbytearray/qbytearray.pro -./tools/qbytearray/main.cpp -./tools/qbytearray/Makefile ./tools/containers-associative ./tools/containers-associative/containers-associative.pro ./tools/containers-associative/main.cpp diff --git a/tests/benchmarks/corelib/tools/tools.pro b/tests/benchmarks/corelib/tools/tools.pro index 33cbe00438c..b4ee0520a63 100644 --- a/tests/benchmarks/corelib/tools/tools.pro +++ b/tests/benchmarks/corelib/tools/tools.pro @@ -2,19 +2,12 @@ TEMPLATE = subdirs SUBDIRS = \ containers-associative \ containers-sequential \ - qbytearray \ qcontiguouscache \ qcryptographichash \ qlist \ - qlocale \ qmap \ qrect \ qringbuffer \ qstack \ - qstring \ - qstringbuilder \ - qstringlist \ qvector \ qalgorithms - -!*g++*: SUBDIRS -= qstring diff --git a/util/locale_database/cldr2qlocalexml.py b/util/locale_database/cldr2qlocalexml.py index 5560d8b43fa..1982e3ba27c 100755 --- a/util/locale_database/cldr2qlocalexml.py +++ b/util/locale_database/cldr2qlocalexml.py @@ -38,11 +38,11 @@ command-line argument. Save its standard output (but not error) to a file for later processing by ``./qlocalexml2cpp.py`` When you update the CLDR data, be sure to also update -src/corelib/tools/qt_attribution.json's entry for unicode-cldr. Check +src/corelib/text/qt_attribution.json's entry for unicode-cldr. Check this script's output for unknown language, country or script messages; if any can be resolved, use their entry in common/main/en.xml to append new entries to enumdata.py's lists and update documentation in -src/corelib/tools/qlocale.qdoc, adding the new entries in alphabetic +src/corelib/text/qlocale.qdoc, adding the new entries in alphabetic order. While updating the locale data, check also for updates to MS-Win's diff --git a/util/locale_database/qlocalexml2cpp.py b/util/locale_database/qlocalexml2cpp.py index 2dad2dd57aa..ea89288b4ff 100755 --- a/util/locale_database/qlocalexml2cpp.py +++ b/util/locale_database/qlocalexml2cpp.py @@ -339,7 +339,7 @@ def main(): (data_temp_file, data_temp_file_path) = tempfile.mkstemp("qlocale_data_p", dir=qtsrcdir) data_temp_file = os.fdopen(data_temp_file, "w") - qlocaledata_file = open(qtsrcdir + "/src/corelib/tools/qlocale_data_p.h", "r") + qlocaledata_file = open(qtsrcdir + "/src/corelib/text/qlocale_data_p.h", "r") s = qlocaledata_file.readline() while s and s != GENERATED_BLOCK_START: data_temp_file.write(s) @@ -735,14 +735,14 @@ def main(): data_temp_file.close() qlocaledata_file.close() - os.remove(qtsrcdir + "/src/corelib/tools/qlocale_data_p.h") - os.rename(data_temp_file_path, qtsrcdir + "/src/corelib/tools/qlocale_data_p.h") + os.remove(qtsrcdir + "/src/corelib/text/qlocale_data_p.h") + os.rename(data_temp_file_path, qtsrcdir + "/src/corelib/text/qlocale_data_p.h") # qlocale.h (qlocaleh_temp_file, qlocaleh_temp_file_path) = tempfile.mkstemp("qlocale.h", dir=qtsrcdir) qlocaleh_temp_file = os.fdopen(qlocaleh_temp_file, "w") - qlocaleh_file = open(qtsrcdir + "/src/corelib/tools/qlocale.h", "r") + qlocaleh_file = open(qtsrcdir + "/src/corelib/text/qlocale.h", "r") s = qlocaleh_file.readline() while s and s != GENERATED_BLOCK_START: qlocaleh_temp_file.write(s) @@ -808,14 +808,14 @@ def main(): qlocaleh_temp_file.close() qlocaleh_file.close() - os.remove(qtsrcdir + "/src/corelib/tools/qlocale.h") - os.rename(qlocaleh_temp_file_path, qtsrcdir + "/src/corelib/tools/qlocale.h") + os.remove(qtsrcdir + "/src/corelib/text/qlocale.h") + os.rename(qlocaleh_temp_file_path, qtsrcdir + "/src/corelib/text/qlocale.h") # qlocale.qdoc (qlocaleqdoc_temp_file, qlocaleqdoc_temp_file_path) = tempfile.mkstemp("qlocale.qdoc", dir=qtsrcdir) qlocaleqdoc_temp_file = os.fdopen(qlocaleqdoc_temp_file, "w") - qlocaleqdoc_file = open(qtsrcdir + "/src/corelib/tools/qlocale.qdoc", "r") + qlocaleqdoc_file = open(qtsrcdir + "/src/corelib/text/qlocale.qdoc", "r") s = qlocaleqdoc_file.readline() DOCSTRING = " QLocale's data is based on Common Locale Data Repository " while s: @@ -827,8 +827,8 @@ def main(): qlocaleqdoc_temp_file.close() qlocaleqdoc_file.close() - os.remove(qtsrcdir + "/src/corelib/tools/qlocale.qdoc") - os.rename(qlocaleqdoc_temp_file_path, qtsrcdir + "/src/corelib/tools/qlocale.qdoc") + os.remove(qtsrcdir + "/src/corelib/text/qlocale.qdoc") + os.rename(qlocaleqdoc_temp_file_path, qtsrcdir + "/src/corelib/text/qlocale.qdoc") if __name__ == "__main__": main() diff --git a/util/unicode/README b/util/unicode/README index e52f26175ae..87f055d42d9 100644 --- a/util/unicode/README +++ b/util/unicode/README @@ -19,7 +19,7 @@ To update: need to be expanded, for example. In some cases QChar may need additions to some of its enums. * Build with the modified code, fix any compilation issues. -* That may have updated qtbase/src/corelib/tools/qunicodetables.cpp; +* That may have updated qtbase/src/corelib/text/qunicodetables.cpp; if so the update matters; be sure to commit the changes to data/ at the same time and update tools/qt_attribution.json to match; use the UCD Revision number, rather than the Unicode standard number, as the diff --git a/util/unicode/main.cpp b/util/unicode/main.cpp index ec84667ee5f..84231c6277b 100644 --- a/util/unicode/main.cpp +++ b/util/unicode/main.cpp @@ -3096,7 +3096,7 @@ int main(int, char **) "// We mean it.\n" "//\n\n"; - QFile f("../../src/corelib/tools/qunicodetables.cpp"); + QFile f("../../src/corelib/text/qunicodetables.cpp"); f.open(QFile::WriteOnly|QFile::Truncate); f.write(header); f.write(note); @@ -3116,7 +3116,7 @@ int main(int, char **) f.write("QT_END_NAMESPACE\n"); f.close(); - f.setFileName("../../src/corelib/tools/qunicodetables_p.h"); + f.setFileName("../../src/corelib/text/qunicodetables_p.h"); f.open(QFile::WriteOnly | QFile::Truncate); f.write(header); f.write(note);