From 5f013bc10f825f63f33a2b073c5883895e992429 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 7 Apr 2020 11:20:22 +0200 Subject: Move Qt::codecForHtml() to qtextcodec.* The method should move out of Qt together with QTextCodec in Qt 6. Qt 6 will in any case always assume utf8 for 8bit encoded HTML. Change-Id: I68adbc1f0df7e36a82ef6b434ee3771f23e3b790 Reviewed-by: Simon Hausmann --- src/corelib/codecs/qtextcodec.cpp | 11 +++++++++++ src/corelib/codecs/qtextcodec.h | 5 +++++ 2 files changed, 16 insertions(+) (limited to 'src/corelib/codecs') diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp index 06fd88da90..72c7844561 100644 --- a/src/corelib/codecs/qtextcodec.cpp +++ b/src/corelib/codecs/qtextcodec.cpp @@ -1275,4 +1275,15 @@ bool QTextDecoder::needsMoreData() const return state.remainingChars; } +/*! + \fn QTextCodec *Qt::codecForHtml(const QByteArray &ba) + \internal + + This function is defined in the \c header file. +*/ +QTextCodec *Qt::codecForHtml(const QByteArray &ba) +{ + return QTextCodec::codecForHtml(ba); +} + QT_END_NAMESPACE diff --git a/src/corelib/codecs/qtextcodec.h b/src/corelib/codecs/qtextcodec.h index 3010a2714e..885518d17f 100644 --- a/src/corelib/codecs/qtextcodec.h +++ b/src/corelib/codecs/qtextcodec.h @@ -167,6 +167,11 @@ private: QTextCodec::ConverterState state; }; +namespace Qt +{ + Q_CORE_EXPORT QTextCodec *codecForHtml(const QByteArray &ba); +} + QT_END_NAMESPACE #endif // QTEXTCODEC_H -- cgit v1.2.3