From 4a0545b299b15a567f2b558cd9095426ba9ee091 Mon Sep 17 00:00:00 2001
From: xiaoyifang <yifang.xiao@outlook.com>
Date: Tue, 1 Mar 2022 00:26:59 +0800
Subject: [PATCH] upgrade to 6.2

---
 gddebug.cc     | 6 +++++-
 indexedzip.cc  | 4 +++-
 mdictparser.cc | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/gddebug.cc b/gddebug.cc
index 7c08f5c0..df57aa5d 100644
--- a/gddebug.cc
+++ b/gddebug.cc
@@ -1,9 +1,13 @@
 /* This file is (c) 2013 Abs62
  * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
 
-#include <QTextCodec>
 #include <QString>
 #include "gddebug.hh"
+#if(QT_VERSION >= QT_VERSION_CHECK(6,0,0))
+#include <QtCore5Compat/QTextCodec>
+#else
+#include <QTextCodec>
+#endif
 
 QFile * logFilePtr;
 static QTextCodec * utf8Codec;
diff --git a/indexedzip.cc b/indexedzip.cc
index 4ccc4d50..c5b77713 100644
--- a/indexedzip.cc
+++ b/indexedzip.cc
@@ -9,7 +9,9 @@
 #include "iconv.hh"
 #include "wstring_qt.hh"
 #if (QT_VERSION >= QT_VERSION_CHECK(6,0,0))
-#include <QtCore5Compat>
+#include <QtCore5Compat/QTextCodec>
+#else
+#include <QTextCodec>
 #endif
 #include <QDebug>
 
diff --git a/mdictparser.cc b/mdictparser.cc
index ae6039cd..dee23a45 100644
--- a/mdictparser.cc
+++ b/mdictparser.cc
@@ -32,8 +32,11 @@
 #include <QDomDocument>
 #include <QTextDocumentFragment>
 #include <QDataStream>
+#if (QT_VERSION >= QT_VERSION_CHECK(6,0,0))
+#include <QtCore5Compat/QTextCodec>
+#else
 #include <QTextCodec>
-
+#endif
 #include "decompress.hh"
 #include "gddebug.hh"
 #include "ripemd.hh"