Move text-related code out of corelib/tools/ to corelib/text/

This includes byte array, string, char, unicode, locale, collation and
regular expressions.

Change-Id: I8b125fa52c8c513eb57a0f1298b91910e5a0d786
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

66 files changed, 118 insertions, 106 deletions

diff --git a/src/corelib/configure.json b/src/corelib/configure.json
index 88c7bbfbed..83c30fb47b 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 521f840292..b9bcc70e17 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
index 1c73202b74..1c73202b74 100644
--- a/src/corelib/tools/UNICODE_LICENSE.txt
+++ b/src/corelib/text/UNICODE_LICENSE.txt
diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/text/qbytearray.cpp
index ecbb4743af..fcf7b5e709 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
index 7c571706d8..7c571706d8 100644
--- a/src/corelib/tools/qbytearray.h
+++ b/src/corelib/text/qbytearray.h
diff --git a/src/corelib/tools/qbytearray_p.h b/src/corelib/text/qbytearray_p.h
index 6ebff739cd..3c6257f786 100644
--- a/src/corelib/tools/qbytearray_p.h
+++ b/src/corelib/text/qbytearray_p.h
@@ -52,7 +52,7 @@
 //
 
 #include <QtCore/qbytearray.h>
-#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
index d04555ed4d..d04555ed4d 100644
--- a/src/corelib/tools/qbytearraylist.cpp
+++ b/src/corelib/text/qbytearraylist.cpp
diff --git a/src/corelib/tools/qbytearraylist.h b/src/corelib/text/qbytearraylist.h
index 0250b649b8..0250b649b8 100644
--- a/src/corelib/tools/qbytearraylist.h
+++ b/src/corelib/text/qbytearraylist.h
diff --git a/src/corelib/tools/qbytearraymatcher.cpp b/src/corelib/text/qbytearraymatcher.cpp
index 72e09226af..72e09226af 100644
--- a/src/corelib/tools/qbytearraymatcher.cpp
+++ b/src/corelib/text/qbytearraymatcher.cpp
diff --git a/src/corelib/tools/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h
index 0eedfc1d20..0eedfc1d20 100644
--- a/src/corelib/tools/qbytearraymatcher.h
+++ b/src/corelib/text/qbytearraymatcher.h
diff --git a/src/corelib/tools/qbytedata_p.h b/src/corelib/text/qbytedata_p.h
index b319d75811..b319d75811 100644
--- a/src/corelib/tools/qbytedata_p.h
+++ b/src/corelib/text/qbytedata_p.h
diff --git a/src/corelib/tools/qchar.cpp b/src/corelib/text/qchar.cpp
index 0c190c6a3d..0c190c6a3d 100644
--- a/src/corelib/tools/qchar.cpp
+++ b/src/corelib/text/qchar.cpp
diff --git a/src/corelib/tools/qchar.h b/src/corelib/text/qchar.h
index e028a24c24..e028a24c24 100644
--- a/src/corelib/tools/qchar.h
+++ b/src/corelib/text/qchar.h
diff --git a/src/corelib/tools/qcollator.cpp b/src/corelib/text/qcollator.cpp
index 958216bde8..958216bde8 100644
--- a/src/corelib/tools/qcollator.cpp
+++ b/src/corelib/text/qcollator.cpp
diff --git a/src/corelib/tools/qcollator.h b/src/corelib/text/qcollator.h
index 6bb5038371..6bb5038371 100644
--- a/src/corelib/tools/qcollator.h
+++ b/src/corelib/text/qcollator.h
diff --git a/src/corelib/tools/qcollator_icu.cpp b/src/corelib/text/qcollator_icu.cpp
index 8acda45070..8acda45070 100644
--- a/src/corelib/tools/qcollator_icu.cpp
+++ b/src/corelib/text/qcollator_icu.cpp
diff --git a/src/corelib/tools/qcollator_macx.cpp b/src/corelib/text/qcollator_macx.cpp
index 071d7c048f..071d7c048f 100644
--- a/src/corelib/tools/qcollator_macx.cpp
+++ b/src/corelib/text/qcollator_macx.cpp
diff --git a/src/corelib/tools/qcollator_p.h b/src/corelib/text/qcollator_p.h
index fc2d434a8d..fc2d434a8d 100644
--- a/src/corelib/tools/qcollator_p.h
+++ b/src/corelib/text/qcollator_p.h
diff --git a/src/corelib/tools/qcollator_posix.cpp b/src/corelib/text/qcollator_posix.cpp
index 9cbc539ebe..9cbc539ebe 100644
--- a/src/corelib/tools/qcollator_posix.cpp
+++ b/src/corelib/text/qcollator_posix.cpp
diff --git a/src/corelib/tools/qcollator_win.cpp b/src/corelib/text/qcollator_win.cpp
index 9d81de882f..9d81de882f 100644
--- a/src/corelib/tools/qcollator_win.cpp
+++ b/src/corelib/text/qcollator_win.cpp
diff --git a/src/corelib/tools/qdoublescanprint_p.h b/src/corelib/text/qdoublescanprint_p.h
index 3865c69a99..3865c69a99 100644
--- a/src/corelib/tools/qdoublescanprint_p.h
+++ b/src/corelib/text/qdoublescanprint_p.h
diff --git a/src/corelib/tools/qharfbuzz.cpp b/src/corelib/text/qharfbuzz.cpp
index a3e266ccd2..a3e266ccd2 100644
--- a/src/corelib/tools/qharfbuzz.cpp
+++ b/src/corelib/text/qharfbuzz.cpp
diff --git a/src/corelib/tools/qharfbuzz_p.h b/src/corelib/text/qharfbuzz_p.h
index 2a0307d35f..2a0307d35f 100644
--- a/src/corelib/tools/qharfbuzz_p.h
+++ b/src/corelib/text/qharfbuzz_p.h
diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/text/qlocale.cpp
index 939f8eb34d..939f8eb34d 100644
--- a/src/corelib/tools/qlocale.cpp
+++ b/src/corelib/text/qlocale.cpp
diff --git a/src/corelib/tools/qlocale.h b/src/corelib/text/qlocale.h
index 09de830ca3..09de830ca3 100644
--- a/src/corelib/tools/qlocale.h
+++ b/src/corelib/text/qlocale.h
diff --git a/src/corelib/tools/qlocale.qdoc b/src/corelib/text/qlocale.qdoc
index 426cb9dbeb..426cb9dbeb 100644
--- a/src/corelib/tools/qlocale.qdoc
+++ b/src/corelib/text/qlocale.qdoc
diff --git a/src/corelib/tools/qlocale_data_p.h b/src/corelib/text/qlocale_data_p.h
index 2c351a3fb1..2c351a3fb1 100644
--- a/src/corelib/tools/qlocale_data_p.h
+++ b/src/corelib/text/qlocale_data_p.h
diff --git a/src/corelib/tools/qlocale_icu.cpp b/src/corelib/text/qlocale_icu.cpp
index afe0aae583..afe0aae583 100644
--- a/src/corelib/tools/qlocale_icu.cpp
+++ b/src/corelib/text/qlocale_icu.cpp
diff --git a/src/corelib/tools/qlocale_mac.mm b/src/corelib/text/qlocale_mac.mm
index 9719278426..9719278426 100644
--- a/src/corelib/tools/qlocale_mac.mm
+++ b/src/corelib/text/qlocale_mac.mm
diff --git a/src/corelib/tools/qlocale_p.h b/src/corelib/text/qlocale_p.h
index 37afb8542b..37afb8542b 100644
--- a/src/corelib/tools/qlocale_p.h
+++ b/src/corelib/text/qlocale_p.h
diff --git a/src/corelib/tools/qlocale_tools.cpp b/src/corelib/text/qlocale_tools.cpp
index db8c8cd12f..db8c8cd12f 100644
--- a/src/corelib/tools/qlocale_tools.cpp
+++ b/src/corelib/text/qlocale_tools.cpp
diff --git a/src/corelib/tools/qlocale_tools_p.h b/src/corelib/text/qlocale_tools_p.h
index 594331ae37..594331ae37 100644
--- a/src/corelib/tools/qlocale_tools_p.h
+++ b/src/corelib/text/qlocale_tools_p.h
diff --git a/src/corelib/tools/qlocale_unix.cpp b/src/corelib/text/qlocale_unix.cpp
index ff4274d932..ff4274d932 100644
--- a/src/corelib/tools/qlocale_unix.cpp
+++ b/src/corelib/text/qlocale_unix.cpp
diff --git a/src/corelib/tools/qlocale_win.cpp b/src/corelib/text/qlocale_win.cpp
index dc904ad02d..dc904ad02d 100644
--- a/src/corelib/tools/qlocale_win.cpp
+++ b/src/corelib/text/qlocale_win.cpp
diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/text/qregexp.cpp
index d81826b47b..d81826b47b 100644
--- a/src/corelib/tools/qregexp.cpp
+++ b/src/corelib/text/qregexp.cpp
diff --git a/src/corelib/tools/qregexp.h b/src/corelib/text/qregexp.h
index 8f6de24c74..8f6de24c74 100644
--- a/src/corelib/tools/qregexp.h
+++ b/src/corelib/text/qregexp.h
diff --git a/src/corelib/tools/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp
index 17acd476b2..17acd476b2 100644
--- a/src/corelib/tools/qregularexpression.cpp
+++ b/src/corelib/text/qregularexpression.cpp
diff --git a/src/corelib/tools/qregularexpression.h b/src/corelib/text/qregularexpression.h
index f799a38ae4..f799a38ae4 100644
--- a/src/corelib/tools/qregularexpression.h
+++ b/src/corelib/text/qregularexpression.h
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/text/qstring.cpp
index 12506afdef..2a98b169f3 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/text/qstring.cpp
@@ -49,8 +49,8 @@
 #include <qtextcodec.h>
 #endif
 #include <private/qutfcodec_p.h>
-#include <private/qlocale_tools_p.h>
-#include "qsimd_p.h"
+#include "qlocale_tools_p.h"
+#include "private/qsimd_p.h"
 #include <qnumeric.h>
 #include <qdatastream.h>
 #include <qlist.h>
@@ -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
index 9896553f7d..9896553f7d 100644
--- a/src/corelib/tools/qstring.h
+++ b/src/corelib/text/qstring.h
diff --git a/src/corelib/tools/qstring_compat.cpp b/src/corelib/text/qstring_compat.cpp
index 45bb816e4b..45bb816e4b 100644
--- a/src/corelib/tools/qstring_compat.cpp
+++ b/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
index 202f322310..202f322310 100644
--- a/src/corelib/tools/qstring_mips_dsp_asm.S
+++ b/src/corelib/text/qstring_mips_dsp_asm.S
diff --git a/src/corelib/tools/qstringalgorithms.h b/src/corelib/text/qstringalgorithms.h
index 2b480b1e4c..2b480b1e4c 100644
--- a/src/corelib/tools/qstringalgorithms.h
+++ b/src/corelib/text/qstringalgorithms.h
diff --git a/src/corelib/tools/qstringalgorithms_p.h b/src/corelib/text/qstringalgorithms_p.h
index 64d9f2e676..64d9f2e676 100644
--- a/src/corelib/tools/qstringalgorithms_p.h
+++ b/src/corelib/text/qstringalgorithms_p.h
diff --git a/src/corelib/tools/qstringbuilder.cpp b/src/corelib/text/qstringbuilder.cpp
index cf443ec369..cf443ec369 100644
--- a/src/corelib/tools/qstringbuilder.cpp
+++ b/src/corelib/text/qstringbuilder.cpp
diff --git a/src/corelib/tools/qstringbuilder.h b/src/corelib/text/qstringbuilder.h
index b3cf2f695e..b3cf2f695e 100644
--- a/src/corelib/tools/qstringbuilder.h
+++ b/src/corelib/text/qstringbuilder.h
diff --git a/src/corelib/tools/qstringiterator.qdoc b/src/corelib/text/qstringiterator.qdoc
index 9d7c54ce9f..9d7c54ce9f 100644
--- a/src/corelib/tools/qstringiterator.qdoc
+++ b/src/corelib/text/qstringiterator.qdoc
diff --git a/src/corelib/tools/qstringiterator_p.h b/src/corelib/text/qstringiterator_p.h
index 219589b6e4..219589b6e4 100644
--- a/src/corelib/tools/qstringiterator_p.h
+++ b/src/corelib/text/qstringiterator_p.h
diff --git a/src/corelib/tools/qstringlist.cpp b/src/corelib/text/qstringlist.cpp
index 4bbe424ed2..4bbe424ed2 100644
--- a/src/corelib/tools/qstringlist.cpp
+++ b/src/corelib/text/qstringlist.cpp
diff --git a/src/corelib/tools/qstringlist.h b/src/corelib/text/qstringlist.h
index a464d443dc..a464d443dc 100644
--- a/src/corelib/tools/qstringlist.h
+++ b/src/corelib/text/qstringlist.h
diff --git a/src/corelib/tools/qstringliteral.h b/src/corelib/text/qstringliteral.h
index 603f19c0b4..603f19c0b4 100644
--- a/src/corelib/tools/qstringliteral.h
+++ b/src/corelib/text/qstringliteral.h
diff --git a/src/corelib/tools/qstringmatcher.cpp b/src/corelib/text/qstringmatcher.cpp
index 167a467480..167a467480 100644
--- a/src/corelib/tools/qstringmatcher.cpp
+++ b/src/corelib/text/qstringmatcher.cpp
diff --git a/src/corelib/tools/qstringmatcher.h b/src/corelib/text/qstringmatcher.h
index 6de4353930..6de4353930 100644
--- a/src/corelib/tools/qstringmatcher.h
+++ b/src/corelib/text/qstringmatcher.h
diff --git a/src/corelib/tools/qstringview.cpp b/src/corelib/text/qstringview.cpp
index cc852dd042..cc852dd042 100644
--- a/src/corelib/tools/qstringview.cpp
+++ b/src/corelib/text/qstringview.cpp
diff --git a/src/corelib/tools/qstringview.h b/src/corelib/text/qstringview.h
index b84b2995b9..b84b2995b9 100644
--- a/src/corelib/tools/qstringview.h
+++ b/src/corelib/text/qstringview.h
diff --git a/src/corelib/tools/qt_attribution.json b/src/corelib/text/qt_attribution.json
index f91742d421..f91742d421 100644
--- a/src/corelib/tools/qt_attribution.json
+++ b/src/corelib/text/qt_attribution.json
diff --git a/src/corelib/tools/qtextboundaryfinder.cpp b/src/corelib/text/qtextboundaryfinder.cpp
index 67dd15377b..67dd15377b 100644
--- a/src/corelib/tools/qtextboundaryfinder.cpp
+++ b/src/corelib/text/qtextboundaryfinder.cpp
diff --git a/src/corelib/tools/qtextboundaryfinder.h b/src/corelib/text/qtextboundaryfinder.h
index b1e5008f54..b1e5008f54 100644
--- a/src/corelib/tools/qtextboundaryfinder.h
+++ b/src/corelib/text/qtextboundaryfinder.h
diff --git a/src/corelib/tools/qunicodetables.cpp b/src/corelib/text/qunicodetables.cpp
index d57b39ff1f..d57b39ff1f 100644
--- a/src/corelib/tools/qunicodetables.cpp
+++ b/src/corelib/text/qunicodetables.cpp
diff --git a/src/corelib/tools/qunicodetables_p.h b/src/corelib/text/qunicodetables_p.h
index cb7a211cb6..cb7a211cb6 100644
--- a/src/corelib/tools/qunicodetables_p.h
+++ b/src/corelib/text/qunicodetables_p.h
diff --git a/src/corelib/tools/qunicodetools.cpp b/src/corelib/text/qunicodetools.cpp
index 08e1146c59..08e1146c59 100644
--- a/src/corelib/tools/qunicodetools.cpp
+++ b/src/corelib/text/qunicodetools.cpp
diff --git a/src/corelib/tools/qunicodetools_p.h b/src/corelib/text/qunicodetools_p.h
index ed6fcb5d65..ed6fcb5d65 100644
--- a/src/corelib/tools/qunicodetools_p.h
+++ b/src/corelib/text/qunicodetools_p.h
diff --git a/src/corelib/tools/qvsnprintf.cpp b/src/corelib/text/qvsnprintf.cpp
index 43a21771a1..43a21771a1 100644
--- a/src/corelib/tools/qvsnprintf.cpp
+++ b/src/corelib/text/qvsnprintf.cpp
diff --git a/src/corelib/text/text.pri b/src/corelib/text/text.pri
new file mode 100644
index 0000000000..e279679655
--- /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 52eddd5d6b..a2236f90f2 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 757460393e..f4d930babb 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