diff options
| author | Christian Stenger <christian.stenger@qt.io> | 2022-10-20 10:21:14 +0200 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2023-06-06 15:55:52 +0300 |
| commit | a11fb3ca2d3521d11b37b8754df1bac6ca16a90e (patch) | |
| tree | 2f3faca35574432494d6cdd25bd817f29edb39b0 /src/libs/installer/packagemanagercore.cpp | |
| parent | 9f06f9f34cef3b4db51c03806b1f3b0f06cf7889 (diff) | |
Adapt to QTextCodec changes
Task-number: QTIFW-1829
Change-Id: Iad99b41ec67b0d4c64623da04fff65a737f46ff2
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
Diffstat (limited to 'src/libs/installer/packagemanagercore.cpp')
| -rw-r--r-- | src/libs/installer/packagemanagercore.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp index 9c670a95d..31fa3d744 100644 --- a/src/libs/installer/packagemanagercore.cpp +++ b/src/libs/installer/packagemanagercore.cpp @@ -56,9 +56,15 @@ #include <QtCore/QMutex> #include <QtCore/QSettings> #include <QtCore/QTemporaryFile> +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +#include <QtCore5Compat/QTextCodec> +#include <QtCore5Compat/QTextDecoder> +#include <QtCore5Compat/QTextEncoder> +#else #include <QtCore/QTextCodec> #include <QtCore/QTextDecoder> #include <QtCore/QTextEncoder> +#endif #include <QtCore/QTextStream> #include <QDesktopServices> @@ -1032,8 +1038,7 @@ QString PackageManagerCore::readFile(const QString &filePath, const QString &cod return QString(); QTextStream stream(&f); - stream.setCodec(codec); - return stream.readAll(); + return QString::fromUtf8(codec->fromUnicode(stream.readAll())); } /*! |