summaryrefslogtreecommitdiffstats
path: root/src/corelib/codecs/qtextcodec.h
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2020-04-07 11:20:22 +0200
committerLars Knoll <lars.knoll@qt.io>2020-04-24 23:44:50 +0200
commit5f013bc10f825f63f33a2b073c5883895e992429 (patch)
tree22ec0da4e73f68c58afe4bd6f725e7da58150206 /src/corelib/codecs/qtextcodec.h
parent26a38db8a219f7f14627e81f9a2c87599854cd52 (diff)
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/qtextcodec.h')
-rw-r--r--src/corelib/codecs/qtextcodec.h5
1 files changed, 5 insertions, 0 deletions
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