diff --git a/src/corelib/compat/removed_api.cpp b/src/corelib/compat/removed_api.cpp index 655da8bd409..0963602ca59 100644 --- a/src/corelib/compat/removed_api.cpp +++ b/src/corelib/compat/removed_api.cpp @@ -1148,6 +1148,10 @@ bool QtPrivate::ResultIteratorBase::operator!=(const QtPrivate::ResultIteratorBa #include "qstringconverter.h" +QStringConverter::QStringConverter(const char *name, Flags f) + : QStringConverter(QAnyStringView{name}, f) +{} + auto QStringConverter::encodingForName(const char *name) noexcept -> std::optional { return encodingForName(QAnyStringView{name}); diff --git a/src/corelib/text/qstringconverter.cpp b/src/corelib/text/qstringconverter.cpp index 745261cd559..03715b54296 100644 --- a/src/corelib/text/qstringconverter.cpp +++ b/src/corelib/text/qstringconverter.cpp @@ -2146,6 +2146,10 @@ struct QStringConverterICU : QStringConverter return conv; } + static const QStringConverter::Interface * + make_icu_converter(QStringConverterBase::State *state, QAnyStringView name) + { return make_icu_converter(state, name.toString().toLatin1().constData()); } // ### optimize + static const QStringConverter::Interface *make_icu_converter( QStringConverterBase::State *state, const char *name) @@ -2183,7 +2187,7 @@ struct QStringConverterICU : QStringConverter /*! \internal */ -QStringConverter::QStringConverter(const char *name, Flags f) +QStringConverter::QStringConverter(QAnyStringView name, Flags f) : iface(nullptr), state(f) { auto e = encodingForName(name); diff --git a/src/corelib/text/qstringconverter_base.h b/src/corelib/text/qstringconverter_base.h index 0c4a19cbe7b..a78c64a96ba 100644 --- a/src/corelib/text/qstringconverter_base.h +++ b/src/corelib/text/qstringconverter_base.h @@ -138,7 +138,10 @@ protected: constexpr explicit QStringConverter(const Interface *i) noexcept : iface(i) {} +#if QT_CORE_REMOVED_SINCE(6, 8) Q_CORE_EXPORT explicit QStringConverter(const char *name, Flags f); +#endif + Q_CORE_EXPORT explicit QStringConverter(QAnyStringView name, Flags f); ~QStringConverter() = default;