Merge remote-tracking branch 'origin/10.0' into qds/dev

Change-Id: I51801c3bec7e29f7c7384d86d79b4fcabb4f99c1
This commit is contained in:
Tim Jenßen
2023-04-27 20:26:12 +02:00
46 changed files with 814 additions and 149 deletions

View File

@@ -2913,9 +2913,9 @@ void TextEditorWidget::insertCodeSnippet(const QTextCursor &cursor_arg,
d->m_document->autoIndent(cursor);
cursor.endEditBlock();
const QColor &occurrencesColor
const QColor occurrencesColor
= textDocument()->fontSettings().toTextCharFormat(C_OCCURRENCES).background().color();
const QColor &renameColor
const QColor renameColor
= textDocument()->fontSettings().toTextCharFormat(C_OCCURRENCES_RENAME).background().color();
for (const CursorPart &part : cursorParts) {