diff options
Diffstat (limited to 'src/modules/file')
| -rw-r--r-- | src/modules/file/libkvifile.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/modules/file/libkvifile.cpp b/src/modules/file/libkvifile.cpp index b57cd7f26..ac527f720 100644 --- a/src/modules/file/libkvifile.cpp +++ b/src/modules/file/libkvifile.cpp @@ -35,7 +35,11 @@ #include <QFileInfo> #include <QDir> #include <QTextStream> +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) #include <QTextCodec> +#else +#include <QStringConverter> +#endif #include <QByteArray> #include <QDateTime> @@ -1081,8 +1085,11 @@ static bool file_kvs_fnc_readLines(KviKvsModuleFunctionCall * c) QTextStream stream(&f); - if(!bLocal8Bit) - stream.setCodec(QTextCodec::codecForMib(106)); +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) + stream.setCodec(bLocal8Bit ? QTextCodec::codecForLocale() : QTextCodec::codecForMib(106)); +#else + stream.setEncoding(bLocal8Bit ? QStringConverter::Latin1 : QStringConverter::Utf8); +#endif for(int i = 0; i < iStartLine; i++) stream.readLine(); |