From 63b88fed74445e64f05f4cade352a56c7291375e Mon Sep 17 00:00:00 2001
From: Nicolas Fella <nicolas.fella@gmx.de>
Date: Thu, 10 Dec 2020 21:15:56 +0100
Subject: Adapt to Qt6 text codec changes

In Qt6 QTextCodec/QTextStream::setCodec is replaced with
QTextStream::setEncoding(QStringConverter::Encoding)

Also UTF-8 is the new default for QTextStream.
---
 autotests/kconfigtest.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'autotests/kconfigtest.cpp')

diff --git a/autotests/kconfigtest.cpp b/autotests/kconfigtest.cpp
index 20414e45..6f79f072 100644
--- a/autotests/kconfigtest.cpp
+++ b/autotests/kconfigtest.cpp
@@ -518,7 +518,9 @@ void KConfigTest::testPath()
         QFile file(testConfigDir() + "/pathtest");
         file.open(QIODevice::WriteOnly | QIODevice::Text);
         QTextStream out(&file);
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
         out.setCodec("UTF-8");
+#endif
         out << "[Test Group]\n"
             << "homePath=$HOME/foo\n"
             << "homePath2=file://$HOME/foo\n"
@@ -580,7 +582,9 @@ void KConfigTest::testPathQtHome()
         QFile file(testConfigDir() + "/pathtest");
         file.open(QIODevice::WriteOnly | QIODevice::Text);
         QTextStream out(&file);
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
         out.setCodec("UTF-8");
+#endif
         out << "[Test Group]\n"
             << "dataDir[$e]=$QT_DATA_HOME/kconfigtest\n"
             << "cacheDir[$e]=$QT_CACHE_HOME/kconfigtest\n"
@@ -1020,7 +1024,9 @@ void KConfigTest::testMerge()
         QFile file(testConfigDir() + "/mergetest");
         file.open(QIODevice::WriteOnly | QIODevice::Text);
         QTextStream out(&file);
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
         out.setCodec("UTF-8");
+#endif
         out << "[Merged Group]\n"
             << "entry1=Testing\n"
             << "entry2=More Testing\n"
@@ -1058,7 +1064,9 @@ void KConfigTest::testImmutable()
         QFile file(testConfigDir() + "/immutabletest");
         file.open(QIODevice::WriteOnly | QIODevice::Text);
         QTextStream out(&file);
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
         out.setCodec("UTF-8");
+#endif
         out << "[$i]\n"
             << "entry1=Testing\n"
             << "[group][$i]\n"
@@ -1083,7 +1091,9 @@ void KConfigTest::testOptionOrder()
         QFile file(testConfigDir() + "/doubleattrtest");
         file.open(QIODevice::WriteOnly | QIODevice::Text);
         QTextStream out(&file);
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
         out.setCodec("UTF-8");
+#endif
         out << "[group3]\n"
             << "entry2=unlocalized\n"
             << "entry2[$i][de_DE]=t2\n";
-- 
cgit v1.2.1