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 /qmake/qmake.pro | |
| 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 'qmake/qmake.pro')
| -rw-r--r-- | qmake/qmake.pro | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/qmake/qmake.pro b/qmake/qmake.pro index 243f07ac2c..fcd1c17dcf 100644 --- a/qmake/qmake.pro +++ b/qmake/qmake.pro @@ -159,11 +159,11 @@ SOURCES += \ qsettings.cpp \ qstring.cpp \ qstringbuilder.cpp \ + qstringconverter.cpp \ qstringlist.cpp \ qsystemerror.cpp \ qtemporaryfile.cpp \ qtextstream.cpp \ - qutfcodec.cpp \ quuid.cpp \ qvariant.cpp \ qversionnumber.cpp \ @@ -217,12 +217,13 @@ HEADERS += \ qromancalendar_p.h \ qstring.h \ qstringbuilder.h \ + qstringconverter_p.h \ + qstringconverter.h \ qstringlist.h \ qstringmatcher.h \ qsystemerror_p.h \ qtemporaryfile.h \ qtextstream.h \ - qutfcodec_p.h \ quuid.h \ qvector.h \ qversionnumber.h \ |