diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-04-17 12:10:21 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-05-14 07:46:38 +0200 |
| commit | ea0a08c898fed9cfd8d8eb16613e352740d3eb02 (patch) | |
| tree | 38c2fde7a8ca9266bda81a7a454f298a7e3b6aff /src/tools/bootstrap | |
| parent | f64a6bd638d399403845fe52e6f8e52889f1f52b (diff) | |
Move the UTF conversion methods to qstringconverter
Separate them from the qutfcodec, so that the codec
can later on be moved out of Qt Core.
Fix the QUtf methods to take qsizetype instead of int
for length arguments.
This also makes it possible to not build QTextCodec into
the bootstrap lib anymore.
Change-Id: I0b4f83139d61b19c651520a2f3a5012aa7e85cb8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/tools/bootstrap')
| -rw-r--r-- | src/tools/bootstrap/.prev_CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/tools/bootstrap/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 4 |
3 files changed, 0 insertions, 12 deletions
diff --git a/src/tools/bootstrap/.prev_CMakeLists.txt b/src/tools/bootstrap/.prev_CMakeLists.txt index 8f430c494e..f81e03adff 100644 --- a/src/tools/bootstrap/.prev_CMakeLists.txt +++ b/src/tools/bootstrap/.prev_CMakeLists.txt @@ -41,9 +41,6 @@ qt_add_module(Bootstrap ../../3rdparty/pcre2/src/pcre2_ucp.h ../../3rdparty/pcre2/src/pcre2_valid_utf.c ../../3rdparty/pcre2/src/pcre2_xclass.c - ../../corelib/codecs/qlatincodec.cpp - ../../corelib/codecs/qtextcodec.cpp - ../../corelib/codecs/qutfcodec.cpp ../../corelib/global/qendian.cpp ../../corelib/global/qglobal.cpp ../../corelib/global/qlogging.cpp @@ -109,7 +106,6 @@ qt_add_module(Bootstrap ../../corelib/text/qstringbuilder.cpp ../../corelib/text/qstringconverter.cpp ../../corelib/text/qstringlist.cpp - ../../corelib/text/qstringview.cpp ../../corelib/text/qvsnprintf.cpp ../../corelib/time/qcalendar.cpp ../../corelib/time/qdatetime.cpp diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt index 5a17888003..a5184fbb80 100644 --- a/src/tools/bootstrap/CMakeLists.txt +++ b/src/tools/bootstrap/CMakeLists.txt @@ -42,9 +42,6 @@ qt_extend_target(Bootstrap ../../3rdparty/pcre2/src/pcre2_ucp.h ../../3rdparty/pcre2/src/pcre2_valid_utf.c ../../3rdparty/pcre2/src/pcre2_xclass.c - ../../corelib/codecs/qlatincodec.cpp - ../../corelib/codecs/qtextcodec.cpp - ../../corelib/codecs/qutfcodec.cpp ../../corelib/global/qendian.cpp ../../corelib/global/qglobal.cpp ../../corelib/global/qlogging.cpp @@ -110,7 +107,6 @@ qt_extend_target(Bootstrap ../../corelib/text/qstringbuilder.cpp ../../corelib/text/qstringconverter.cpp ../../corelib/text/qstringlist.cpp - ../../corelib/text/qstringview.cpp ../../corelib/text/qvsnprintf.cpp ../../corelib/time/qcalendar.cpp ../../corelib/time/qdatetime.cpp diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index 169c5fe1c2..5b7da8e687 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -28,9 +28,6 @@ INCLUDEPATH += \ $$PWD/../../3rdparty/pcre2/src SOURCES += \ - ../../corelib/codecs/qlatincodec.cpp \ - ../../corelib/codecs/qtextcodec.cpp \ - ../../corelib/codecs/qutfcodec.cpp \ ../../corelib/global/qendian.cpp \ ../../corelib/global/qglobal.cpp \ ../../corelib/global/qlogging.cpp \ @@ -96,7 +93,6 @@ SOURCES += \ ../../corelib/text/qstringconverter.cpp \ ../../corelib/text/qstring_compat.cpp \ ../../corelib/text/qstringlist.cpp \ - ../../corelib/text/qstringview.cpp \ ../../corelib/text/qvsnprintf.cpp \ ../../corelib/time/qcalendar.cpp \ ../../corelib/time/qdatetime.cpp \ |