From 50916edd9d1707774c597abe1b7237e1a798fc53 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 7 Apr 2020 10:49:17 +0200 Subject: 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 --- src/gui/text/qtextdocument.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gui/text/qtextdocument.h') diff --git a/src/gui/text/qtextdocument.h b/src/gui/text/qtextdocument.h index 5a165331bf..369851ceea 100644 --- a/src/gui/text/qtextdocument.h +++ b/src/gui/text/qtextdocument.h @@ -147,7 +147,7 @@ public: QString metaInformation(MetaInformation info) const; #ifndef QT_NO_TEXTHTMLPARSER - QString toHtml(const QByteArray &encoding = QByteArray()) const; + QString toHtml() const; void setHtml(const QString &html); #endif -- cgit v1.2.3