diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-23 22:16:10 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-23 22:16:10 +0200 |
| commit | 6cc61508acd7b65477e006475f64dc3406af668f (patch) | |
| tree | 7355632654b206a2fab772721cfa72e72ecf3300 /sources/shiboken2/ApiExtractor/fileout.cpp | |
| parent | 54e7da4895cd5d9228cef3e4e3ebc61c5109ed12 (diff) | |
| parent | ff94459c809e2ccd13e6d669b053667d35b3e571 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I0685101058a4a814d97c56177030bf7a66483643
Diffstat (limited to 'sources/shiboken2/ApiExtractor/fileout.cpp')
| -rw-r--r-- | sources/shiboken2/ApiExtractor/fileout.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sources/shiboken2/ApiExtractor/fileout.cpp b/sources/shiboken2/ApiExtractor/fileout.cpp index 10a8f6be8..ba5bf19de 100644 --- a/sources/shiboken2/ApiExtractor/fileout.cpp +++ b/sources/shiboken2/ApiExtractor/fileout.cpp @@ -30,7 +30,9 @@ #include "messages.h" #include "reporthandler.h" -#include <QtCore/QTextCodec> +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) +# include <QtCore/QTextCodec> +#endif #include <QtCore/QFileInfo> #include <QtCore/QDir> #include <QtCore/QDebug> @@ -219,8 +221,10 @@ FileOut::State FileOut::done(QString *errorMessage) *errorMessage = msgCannotOpenForWriting(fileWrite); return Failure; } +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) QTextCodec *codec = QTextCodec::codecForName("UTF-8"); stream.setCodec(codec); +#endif stream.setDevice(&fileWrite); stream << tmp; } |