diff options
author | Lars Knoll <lars.knoll@qt.io> | 2020-04-07 11:20:22 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2020-04-24 23:44:50 +0200 |
commit | 5f013bc10f825f63f33a2b073c5883895e992429 (patch) | |
tree | 22ec0da4e73f68c58afe4bd6f725e7da58150206 /src/corelib/codecs | |
parent | 26a38db8a219f7f14627e81f9a2c87599854cd52 (diff) | |
download | qtbase-5f013bc10f825f63f33a2b073c5883895e992429.tar.gz |
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 <simon.hausmann@qt.io>
Diffstat (limited to 'src/corelib/codecs')
-rw-r--r-- | src/corelib/codecs/qtextcodec.cpp | 11 | ||||
-rw-r--r-- | src/corelib/codecs/qtextcodec.h | 5 |
2 files changed, 16 insertions, 0 deletions
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 <QTextCodec> 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 |