summaryrefslogtreecommitdiffstats
path: root/src/widgets/widgets/qwidgettextcontrol.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2020-04-07 10:49:17 +0200
committerLars Knoll <lars.knoll@qt.io>2020-04-21 15:46:36 +0200
commit50916edd9d1707774c597abe1b7237e1a798fc53 (patch)
treeba761a0d1f017836fb1957212a63ff9854bce76c /src/widgets/widgets/qwidgettextcontrol.cpp
parenta23cb5cd06bcc3268387cb1abaa0dc2c2d3b13f4 (diff)
Always encode HTML as utf-8
When converting a text document to HTML, always convert it to utf-8, as required by the HTML standard. This also means that we remove the optional encoding parameter. Change-Id: I0bd2fc9df2d06734e1c5b8053b964fbfbb6881e1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/widgets/widgets/qwidgettextcontrol.cpp')
-rw-r--r--src/widgets/widgets/qwidgettextcontrol.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp
index e22028aa49..41932214c1 100644
--- a/src/widgets/widgets/qwidgettextcontrol.cpp
+++ b/src/widgets/widgets/qwidgettextcontrol.cpp
@@ -3424,7 +3424,7 @@ void QTextEditMimeData::setup() const
{
QTextEditMimeData *that = const_cast<QTextEditMimeData *>(this);
#ifndef QT_NO_TEXTHTMLPARSER
- that->setData(QLatin1String("text/html"), fragment.toHtml("utf-8").toUtf8());
+ that->setData(QLatin1String("text/html"), fragment.toHtml().toUtf8());
#endif
#ifndef QT_NO_TEXTODFWRITER
{