From 602bffd346f0427e0ee3a928af5c404d806ef3b6 Mon Sep 17 00:00:00 2001
From: Karsten Heimrich <karsten.heimrich@qt.io>
Date: Wed, 17 Jun 2020 13:29:17 +0200
Subject: Port QtQuickControls2 from QTextCodec to QString{Converter|Decoder}

Task-number: QTBUG-75665
Change-Id: Ib66a260dc3bfc39e2e50c38db56ca72b8186a4ac
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 examples/quickcontrols2/texteditor/documenthandler.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'examples')

diff --git a/examples/quickcontrols2/texteditor/documenthandler.cpp b/examples/quickcontrols2/texteditor/documenthandler.cpp
index e840d411..090e0684 100644
--- a/examples/quickcontrols2/texteditor/documenthandler.cpp
+++ b/examples/quickcontrols2/texteditor/documenthandler.cpp
@@ -57,7 +57,7 @@
 #include <QQmlFileSelector>
 #include <QQuickTextDocument>
 #include <QTextCharFormat>
-#include <QTextCodec>
+#include <QStringDecoder>
 #include <QTextDocument>
 #include <QDebug>
 
@@ -295,12 +295,19 @@ void DocumentHandler::load(const QUrl &fileUrl)
     if (QFile::exists(fileName)) {
         QFile file(fileName);
         if (file.open(QFile::ReadOnly)) {
-            QByteArray data = file.readAll();
-            QTextCodec *codec = QTextCodec::codecForHtml(data);
             if (QTextDocument *doc = textDocument())
                 doc->setModified(false);
 
-            emit loaded(codec->toUnicode(data));
+            QByteArray data = file.readAll();
+            auto encoding = QStringConverter::encodingForHtml(data.constData(), data.size());
+            if (encoding) {
+                QStringDecoder decoder(*encoding);
+                emit loaded(decoder(data));
+            } else {
+                // fall back to utf8
+                emit loaded(QString::fromUtf8(data));
+            }
+
             reset();
         }
     }
-- 
cgit v1.2.3