summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2024-04-09 21:34:01 -0700
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2024-04-19 19:11:43 +0000
commit5d1b211aba44a2a6758aa124027c365d7584ab9a (patch)
tree1f701575a27b85a488d1539f168037abd3852c57
parentQStringBuilder: DRY: use the Concatenable typedef (diff)
downloadqtbase-5d1b211aba44a2a6758aa124027c365d7584ab9a.tar.xz
qtbase-5d1b211aba44a2a6758aa124027c365d7584ab9a.zip
QStringConverter/Doc: add more details about additional codecs
Fixes: QTBUG-124221 Change-Id: If1bf59ecbe014b569ba1fffd17c4d113d02425eb Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io> (cherry picked from commit 71e87993d6bb9c3bf61883d66f97a5e0cfa2bfb1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/corelib/text/qstringconverter.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/corelib/text/qstringconverter.cpp b/src/corelib/text/qstringconverter.cpp
index fd45ccf2fd..2041372fda 100644
--- a/src/corelib/text/qstringconverter.cpp
+++ b/src/corelib/text/qstringconverter.cpp
@@ -1774,7 +1774,7 @@ static qsizetype toLatin1Len(qsizetype l) { return l + 1; }
operation, encoding UTF-16 encoded data (usually in the form of a QString) to
the requested encoding.
- The supported encodings are:
+ The following encodings are always supported:
\list
\li UTF-8
@@ -1788,6 +1788,10 @@ static qsizetype toLatin1Len(qsizetype l) { return l + 1; }
\li The system encoding
\endlist
+ QStringConverter may support more encodings depending on how Qt was
+ compiled. If more codecs are supported, they can be listed using
+ availableCodecs().
+
\l {QStringConverter}s can be used as follows to convert some encoded
string to and from UTF-16.
@@ -2356,6 +2360,10 @@ static qsizetype availableCodecCount()
QStringDecoder's constructor to create a en- or decoder for
the given codec.
+ This function may be used to obtain a listing of additional codecs beyond
+ the standard ones. Support for additional codecs requires Qt be compiled
+ with support for the ICU library.
+
\note The order of codecs is an internal implementation detail
and not guaranteed to be stable.
*/