summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qtextdocument.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/gui/text/qtextdocument.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/gui/text/qtextdocument.h')
-rw-r--r--src/gui/text/qtextdocument.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/gui/text/qtextdocument.h b/src/gui/text/qtextdocument.h
index 369851ceea..b34175994d 100644
--- a/src/gui/text/qtextdocument.h
+++ b/src/gui/text/qtextdocument.h
@@ -62,7 +62,6 @@ class QTextObject;
class QTextFormat;
class QTextFrame;
class QTextBlock;
-class QTextCodec;
class QVariant;
class QRectF;
class QTextOption;
@@ -74,10 +73,6 @@ namespace Qt
{
Q_GUI_EXPORT bool mightBeRichText(const QString&);
Q_GUI_EXPORT QString convertFromPlainText(const QString &plain, WhiteSpaceMode mode = WhiteSpacePre);
-
-#if QT_CONFIG(textcodec) || defined(Q_CLANG_QDOC)
- Q_GUI_EXPORT QTextCodec *codecForHtml(const QByteArray &ba);
-#endif
}
class Q_GUI_EXPORT QAbstractUndoItem