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/global | |
| 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/global')
| -rw-r--r-- | src/corelib/global/qconfig-bootstrapped.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h index 349dfeea1c..6ef4acf503 100644 --- a/src/corelib/global/qconfig-bootstrapped.h +++ b/src/corelib/global/qconfig-bootstrapped.h @@ -141,18 +141,17 @@ #define QT_FEATURE_zstd -1 #endif +#define QT_FEATURE_textcodec -1 + #ifdef QT_BUILD_QMAKE #define QT_FEATURE_commandlineparser -1 #define QT_NO_COMPRESS #define QT_JSON_READONLY #define QT_FEATURE_settings 1 #define QT_NO_STANDARDPATHS -#define QT_FEATURE_textcodec -1 #else -#define QT_FEATURE_codecs -1 #define QT_FEATURE_commandlineparser 1 #define QT_FEATURE_settings -1 -#define QT_FEATURE_textcodec 1 #endif #endif // QT_BOOTSTRAPPED |