diff options
author | hjk <hjk@qt.io> | 2020-07-14 14:55:21 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2020-07-15 06:20:57 +0000 |
commit | d47bd61e0c4d085c68f1320c10eb8bda671cd7cb (patch) | |
tree | bd4c8e5936c5513892eef3d9cc84e26403f3fdce /src/libs/3rdparty/syntax-highlighting/src | |
parent | ec7e9e649b3465449b0447b4e8eff8f1ec1208c5 (diff) |
3rdparty/syntax-highlighting: Adapt HtmlHighlighter to Qt6 codec use
Change-Id: Ifb784b02b01f4cfe89879eae7e2866b694f45581
Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'src/libs/3rdparty/syntax-highlighting/src')
-rw-r--r-- | src/libs/3rdparty/syntax-highlighting/src/lib/htmlhighlighter.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/libs/3rdparty/syntax-highlighting/src/lib/htmlhighlighter.cpp b/src/libs/3rdparty/syntax-highlighting/src/lib/htmlhighlighter.cpp index 1dad170744..3acade7f9d 100644 --- a/src/libs/3rdparty/syntax-highlighting/src/lib/htmlhighlighter.cpp +++ b/src/libs/3rdparty/syntax-highlighting/src/lib/htmlhighlighter.cpp @@ -61,13 +61,21 @@ void HtmlHighlighter::setOutputFile(const QString &fileName) return; } d->out.reset(new QTextStream(d->file.get())); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + d->out->setEncoding(QStringConverter::Utf8); +#else d->out->setCodec("UTF-8"); +#endif } void HtmlHighlighter::setOutputFile(FILE *fileHandle) { d->out.reset(new QTextStream(fileHandle, QIODevice::WriteOnly)); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + d->out->setEncoding(QStringConverter::Utf8); +#else d->out->setCodec("UTF-8"); +#endif } void HtmlHighlighter::highlightFile(const QString &fileName, const QString &title) @@ -110,7 +118,11 @@ void HtmlHighlighter::highlightData(QIODevice *dev, const QString &title) *d->out << "><pre>\n"; QTextStream in(dev); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + in.setEncoding(QStringConverter::Utf8); +#else in.setCodec("UTF-8"); +#endif while (!in.atEnd()) { d->currentLine = in.readLine(); state = highlightLine(d->currentLine, state); |