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/corelib/serialization | |
| 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/corelib/serialization')
| -rw-r--r-- | src/corelib/serialization/qcborstreamreader.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/serialization/qcborvalue_p.h | 2 | ||||
| -rw-r--r-- | src/corelib/serialization/qjsonparser.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/serialization/qjsonwriter.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/serialization/qcborstreamreader.cpp b/src/corelib/serialization/qcborstreamreader.cpp index ec385e0629..c49a76aada 100644 --- a/src/corelib/serialization/qcborstreamreader.cpp +++ b/src/corelib/serialization/qcborstreamreader.cpp @@ -44,7 +44,7 @@ #include <private/qbytearray_p.h> #include <private/qnumeric_p.h> -#include <private/qutfcodec_p.h> +#include <private/qstringconverter_p.h> #include <qdebug.h> #include <qstack.h> diff --git a/src/corelib/serialization/qcborvalue_p.h b/src/corelib/serialization/qcborvalue_p.h index 1d686f118b..38383c7522 100644 --- a/src/corelib/serialization/qcborvalue_p.h +++ b/src/corelib/serialization/qcborvalue_p.h @@ -54,7 +54,7 @@ #include "qcborvalue.h" #include <private/qglobal_p.h> -#include <private/qutfcodec_p.h> +#include <private/qstringconverter_p.h> #include <math.h> diff --git a/src/corelib/serialization/qjsonparser.cpp b/src/corelib/serialization/qjsonparser.cpp index 46d82ea47f..116e7f6995 100644 --- a/src/corelib/serialization/qjsonparser.cpp +++ b/src/corelib/serialization/qjsonparser.cpp @@ -44,7 +44,7 @@ #include <qdebug.h> #include "qjsonparser_p.h" #include "qjson_p.h" -#include "private/qutfcodec_p.h" +#include "private/qstringconverter_p.h" #include "private/qcborvalue_p.h" #include "private/qnumeric_p.h" diff --git a/src/corelib/serialization/qjsonwriter.cpp b/src/corelib/serialization/qjsonwriter.cpp index 590b59f09c..8610cdff7e 100644 --- a/src/corelib/serialization/qjsonwriter.cpp +++ b/src/corelib/serialization/qjsonwriter.cpp @@ -42,7 +42,7 @@ #include <qlocale.h> #include "qjsonwriter_p.h" #include "qjson_p.h" -#include "private/qutfcodec_p.h" +#include "private/qstringconverter_p.h" #include <private/qnumeric_p.h> #include <private/qcborvalue_p.h> |