diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-10-12 23:00:10 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-10-12 23:00:10 +0300 |
| commit | 7d773f558f67c4dbc88639a3fff3f706b522d3b0 (patch) | |
| tree | 05c008150a240ae4bb1c8e8c9021775bb521d1ef /src/core5/codecs/qtextcodec.cpp | |
| parent | 7d6d7e41f096899964eb9f0ee3ca43e77fddedbc (diff) | |
| parent | 3fde2b9f6e64859e046a0d4bdd398029da343b62 (diff) | |
Merge tag 'v6.5.7-lts-lgpl' into 6.56.5
Qt 6.5.7-lts-lgpl release
Diffstat (limited to 'src/core5/codecs/qtextcodec.cpp')
| -rw-r--r-- | src/core5/codecs/qtextcodec.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/core5/codecs/qtextcodec.cpp b/src/core5/codecs/qtextcodec.cpp index d57dde3..107e0c3 100644 --- a/src/core5/codecs/qtextcodec.cpp +++ b/src/core5/codecs/qtextcodec.cpp @@ -799,7 +799,8 @@ QTextEncoder* QTextCodec::makeEncoder(QTextCodec::ConversionFlags flags) const */ QByteArray QTextCodec::fromUnicode(const QString& str) const { - return convertFromUnicode(str.constData(), str.size(), nullptr); + ConverterState state = DefaultConversion | Flag::Stateless; + return convertFromUnicode(str.constData(), str.size(), &state); } /*! @@ -811,7 +812,8 @@ QByteArray QTextCodec::fromUnicode(const QString& str) const */ QByteArray QTextCodec::fromUnicode(QStringView str) const { - return convertFromUnicode(str.data(), str.size(), nullptr); + ConverterState state = DefaultConversion | Flag::Stateless; + return convertFromUnicode(str.data(), str.size(), &state); } /*! @@ -831,7 +833,8 @@ QByteArray QTextCodec::fromUnicode(QStringView str) const */ QString QTextCodec::toUnicode(const QByteArray& a) const { - return convertToUnicode(a.constData(), a.size(), nullptr); + ConverterState state = DefaultConversion | Flag::Stateless; + return convertToUnicode(a.constData(), a.size(), &state); } /*! |