diff options
Diffstat (limited to 'src/corelib/text/qstringbuilder.cpp')
| -rw-r--r-- | src/corelib/text/qstringbuilder.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/corelib/text/qstringbuilder.cpp b/src/corelib/text/qstringbuilder.cpp index 3016392e45..dcb3644fb0 100644 --- a/src/corelib/text/qstringbuilder.cpp +++ b/src/corelib/text/qstringbuilder.cpp @@ -124,14 +124,9 @@ QT_BEGIN_NAMESPACE /*! \internal */ -void QAbstractConcatenable::convertFromAscii(const char *a, int len, QChar *&out) noexcept +void QAbstractConcatenable::convertFromUtf8(QByteArrayView in, QChar *&out) noexcept { - if (Q_UNLIKELY(len == -1)) { - if (!a) - return; - len = int(strlen(a)); - } - out = QUtf8::convertToUnicode(out, a, len); + out = QUtf8::convertToUnicode(out, in); } QT_END_NAMESPACE |