Merge remote-tracking branch 'origin/9.0'

Change-Id: Ie24672b00aae6c0afa5931d87e6e1c24fb841161
This commit is contained in:
Eike Ziller
2022-11-07 12:59:28 +01:00
30 changed files with 39478 additions and 29718 deletions

View File

@@ -3343,7 +3343,9 @@ void TextEditorWidgetPrivate::updateFileLineEndingVisible()
void TextEditorWidgetPrivate::reconfigure()
{
m_document->setMimeType(Utils::mimeTypeForFile(m_document->filePath()).name());
m_document->setMimeType(
Utils::mimeTypeForFile(m_document->filePath(),
MimeMatchMode::MatchDefaultAndRemote).name());
q->configureGenericHighlighter();
}