diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp index 4da062502dc..731673cdeda 100644 --- a/src/corelib/io/qsettings.cpp +++ b/src/corelib/io/qsettings.cpp @@ -2473,11 +2473,11 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile, "%General" section, \e not in the "General" section. \li In line with most implementations today, QSettings will assume that - \e values in the INI file are utf-8 encoded. This means that \e values - will be decoded as utf-8 encoded entries and written back as utf-8. + \e values in the INI file are UTF-8 encoded. This means that \e values + will be decoded as UTF-8 encoded entries and written back as UTF-8. To retain backward compatibility with older Qt versions, \e keys in the INI file are written in %-encoded format, but can be read in both - %-encoded and utf-8 formats. + %-encoded and UTF-8 formats. \endlist @@ -2488,7 +2488,7 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile, however fully readable by a Qt 6 based application (unless a ini codec different from utf8 had been set). But INI files written with Qt 6 will only be readable by older Qt versions if you set the "iniCodec" to - a utf-8 textcodec. + a UTF-8 textcodec. \sa registerFormat(), setPath() */ diff --git a/src/corelib/text/qbytearray.cpp b/src/corelib/text/qbytearray.cpp index 7c656ba27a8..efbaf0356ad 100644 --- a/src/corelib/text/qbytearray.cpp +++ b/src/corelib/text/qbytearray.cpp @@ -835,7 +835,7 @@ QByteArray qUncompress(const uchar* data, qsizetype nbytes) \endcompareswith \compareswith strong QChar char16_t QString QStringView QLatin1StringView \ QUtf8StringView - When comparing with string types, the content is interpreted as utf-8. + When comparing with string types, the content is interpreted as UTF-8. \endcompareswith QByteArray can be used to store both raw bytes (including '\\0's) diff --git a/src/corelib/text/qchar.cpp b/src/corelib/text/qchar.cpp index 5ec518307d5..f7f0920d647 100644 --- a/src/corelib/text/qchar.cpp +++ b/src/corelib/text/qchar.cpp @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE \compareswith strong char16_t QString QStringView QLatin1StringView QUtf8StringView \endcompareswith \compareswith strong {const char *} QByteArray QByteArrayView - The contents of the byte array is interpreted as utf-8. + The contents of the byte array is interpreted as UTF-8. \endcompareswith In Qt, Unicode characters are 16-bit entities without any markup diff --git a/src/corelib/text/qlatin1stringview.qdoc b/src/corelib/text/qlatin1stringview.qdoc index f331312a2b2..bb8c52929f9 100644 --- a/src/corelib/text/qlatin1stringview.qdoc +++ b/src/corelib/text/qlatin1stringview.qdoc @@ -16,7 +16,7 @@ {const char16_t *} \endcompareswith \compareswith strong {const char *} QByteArray QByteArrayView - The byte array data is interpreted as utf-8. + The byte array data is interpreted as UTF-8. \endcompareswith Many of QString's member functions are overloaded to accept diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp index e43d781bdf6..3d2a0b82b04 100644 --- a/src/corelib/text/qstring.cpp +++ b/src/corelib/text/qstring.cpp @@ -1717,7 +1717,7 @@ void qtWarnAboutInvalidRegularExpression(const QString &pattern, const char *whe QStringView QUtf8StringView \endcompareswith \compareswith strong QByteArray QByteArrayView {const char *} - When comparing with byte arrays, their content is interpreted as utf-8. + When comparing with byte arrays, their content is interpreted as UTF-8. \endcompareswith QString stores a string of 16-bit \l{QChar}s, where each QChar diff --git a/src/corelib/text/qutf8stringview.qdoc b/src/corelib/text/qutf8stringview.qdoc index 303425caa49..30406ccb7ad 100644 --- a/src/corelib/text/qutf8stringview.qdoc +++ b/src/corelib/text/qutf8stringview.qdoc @@ -16,7 +16,7 @@ QLatin1StringView \endcompareswith \compareswith strong {const char *} QByteArray QByteArrayView - The contents of byte arrays is interpreted as utf-8. + The contents of byte arrays is interpreted as UTF-8. \endcompareswith A QUtf8StringView references a contiguous portion of a UTF-8