feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Complie fix for Qt < 6.9

Browse Source 
Before d4c4e6b876b948, QStringEncoder used a char * as codec name.

Change-Id: Iba2fa4ff594aab4dc64fcd63c27ab7b09cfd65cf
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2025-06-16 16:47:15 +02:00
parent 53d3ae80c8
commit 7a38a3c117
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/beautifier/clangformat/clangformat.cpp
View File

@@ -402,7 +402,7 @@ void ClangFormat::formatAtPosition(const int pos, const int length)
const QString &text = widget->textAt(0, pos + length); const QString &text = widget->textAt(0, pos + length);
const QStringView buffer(text); const QStringView buffer(text);
QStringEncoder encoder(encoding); QStringEncoder encoder(encoding.name());
const int encodedOffset = QByteArray(encoder.encode(buffer.left(pos))).size(); const int encodedOffset = QByteArray(encoder.encode(buffer.left(pos))).size();
const int encodedLength = QByteArray(encoder.encode(buffer.mid(pos, length))).size(); const int encodedLength = QByteArray(encoder.encode(buffer.mid(pos, length))).size();
formatCurrentFile(textCommand(encodedOffset, encodedLength)); formatCurrentFile(textCommand(encodedOffset, encodedLength));

2
src/plugins/vcsbase/vcsbaseeditor.cpp
View File

@@ -1224,7 +1224,7 @@ DiffChunk VcsBaseEditorWidget::diffChunk(QTextCursor cursor) const
} }
const TextEncoding encoding = textDocument()->encoding(); const TextEncoding encoding = textDocument()->encoding();
if (encoding.isValid()) { if (encoding.isValid()) {
QStringEncoder encoder(encoding); QStringEncoder encoder(encoding.name());
rc.chunk = encoder.encode(unicode); rc.chunk = encoder.encode(unicode);
rc.header = encoder.encode(header); rc.header = encoder.encode(header);
} else { } else {