From 7a38a3c117a8247baebbeeff3dc54715007e48f0 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 16 Jun 2025 16:47:15 +0200 Subject: [PATCH] Complie fix for Qt < 6.9 Before d4c4e6b876b948, QStringEncoder used a char * as codec name. Change-Id: Iba2fa4ff594aab4dc64fcd63c27ab7b09cfd65cf Reviewed-by: David Schulz --- src/plugins/beautifier/clangformat/clangformat.cpp | 2 +- src/plugins/vcsbase/vcsbaseeditor.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/beautifier/clangformat/clangformat.cpp b/src/plugins/beautifier/clangformat/clangformat.cpp index f453d13161d..8a7d1d8c9ec 100644 --- a/src/plugins/beautifier/clangformat/clangformat.cpp +++ b/src/plugins/beautifier/clangformat/clangformat.cpp @@ -402,7 +402,7 @@ void ClangFormat::formatAtPosition(const int pos, const int length) const QString &text = widget->textAt(0, pos + length); const QStringView buffer(text); - QStringEncoder encoder(encoding); + QStringEncoder encoder(encoding.name()); const int encodedOffset = QByteArray(encoder.encode(buffer.left(pos))).size(); const int encodedLength = QByteArray(encoder.encode(buffer.mid(pos, length))).size(); formatCurrentFile(textCommand(encodedOffset, encodedLength)); diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp index 65dd372af1d..35caa6b2322 100644 --- a/src/plugins/vcsbase/vcsbaseeditor.cpp +++ b/src/plugins/vcsbase/vcsbaseeditor.cpp @@ -1224,7 +1224,7 @@ DiffChunk VcsBaseEditorWidget::diffChunk(QTextCursor cursor) const } const TextEncoding encoding = textDocument()->encoding(); if (encoding.isValid()) { - QStringEncoder encoder(encoding); + QStringEncoder encoder(encoding.name()); rc.chunk = encoder.encode(unicode); rc.header = encoder.encode(header); } else {