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/gui/text/qtextdocument.cpp | |
| parent | 26a38db8a219f7f14627e81f9a2c87599854cd52 (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.cpp')
| -rw-r--r-- | src/gui/text/qtextdocument.cpp | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp index 9cc1ba6c1c..04350bcda5 100644 --- a/src/gui/text/qtextdocument.cpp +++ b/src/gui/text/qtextdocument.cpp @@ -51,9 +51,6 @@ #include <qregularexpression.h> #endif #include <qvarlengtharray.h> -#if QT_CONFIG(textcodec) -#include <qtextcodec.h> -#endif #include <qthread.h> #include <qcoreapplication.h> #include <qmetaobject.h> @@ -212,19 +209,6 @@ QString Qt::convertFromPlainText(const QString &plain, Qt::WhiteSpaceMode mode) } /*! - \fn QTextCodec *Qt::codecForHtml(const QByteArray &ba) - \internal - - This function is defined in the \c <QTextDocument> header file. -*/ -#if QT_CONFIG(textcodec) -QTextCodec *Qt::codecForHtml(const QByteArray &ba) -{ - return QTextCodec::codecForHtml(ba); -} -#endif - -/*! \class QTextDocument \reentrant \inmodule QtGui |