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 | |
| parent | 7d6d7e41f096899964eb9f0ee3ca43e77fddedbc (diff) | |
| parent | 3fde2b9f6e64859e046a0d4bdd398029da343b62 (diff) | |
Merge tag 'v6.5.7-lts-lgpl' into 6.56.5
Qt 6.5.7-lts-lgpl release
| -rw-r--r-- | .cmake.conf | 2 | ||||
| -rw-r--r-- | dependencies.yaml | 4 | ||||
| -rw-r--r-- | src/core5/codecs/qtextcodec.cpp | 9 | ||||
| -rw-r--r-- | tests/auto/core5/codecs/qtextcodec/tst_qtextcodec.cpp | 7 |
4 files changed, 13 insertions, 9 deletions
diff --git a/.cmake.conf b/.cmake.conf index 9c68a0a..a90084f 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1,4 +1,4 @@ -set(QT_REPO_MODULE_VERSION "6.5.6") +set(QT_REPO_MODULE_VERSION "6.5.7") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_LEAN_HEADERS=1") list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") diff --git a/dependencies.yaml b/dependencies.yaml index 85aae14..dbb9bf0 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../tqtc-qtbase: - ref: 5d8e9a8415562ba004b38508d91e1fa0254c17d3 + ref: fc0e66eefe3a08428ca4a6e92c66f37ac126d3c4 required: true ../tqtc-qtdeclarative: - ref: ff0a47c8f267e905113b82c53af2742027f0eca6 + ref: 844f9b9b376838bcb44324984876f8bf99d85d38 required: false 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); } /*! diff --git a/tests/auto/core5/codecs/qtextcodec/tst_qtextcodec.cpp b/tests/auto/core5/codecs/qtextcodec/tst_qtextcodec.cpp index 595c93a..e2d237d 100644 --- a/tests/auto/core5/codecs/qtextcodec/tst_qtextcodec.cpp +++ b/tests/auto/core5/codecs/qtextcodec/tst_qtextcodec.cpp @@ -672,6 +672,10 @@ void tst_QTextCodec::utf32Codec() QTextCodec *codec = QTextCodec::codecForName("UTF-32"); QCOMPARE(codec->toUnicode(encoded), utf16); + + // prepend BOM because QTextCodec sets us up the BOM + char32_t bom = QChar::ByteOrderMark; + encoded.prepend(reinterpret_cast<const char *>(&bom), sizeof(bom)); QCOMPARE(codec->fromUnicode(utf16), encoded); } @@ -2697,9 +2701,6 @@ void tst_QTextCodec::nullInputZeroOrNegativLength() QCOMPARE(codec->toUnicode("abc", -1), QString()); // null input - QChar* dummy = nullptr; - QStringView view{ dummy }; - QCOMPARE(codec->fromUnicode(view), QByteArray()); QCOMPARE(codec->fromUnicode(nullptr, 0), QByteArray()); QCOMPARE(codec->fromUnicode(nullptr, -1), QByteArray()); QCOMPARE(codec->fromUnicode(nullptr, 128), QByteArray()); |