Merge remote-tracking branch 'origin/12.0'

Conflicts:
	src/plugins/cppeditor/cppfilesettingspage.cpp
	src/plugins/haskell/haskellplugin.h

Change-Id: I880693c2e4986853b7aa600a5b7d6c09ad14634e
This commit is contained in:
Eike Ziller
2024-01-30 09:00:47 +01:00
14 changed files with 68 additions and 23 deletions

View File

@@ -533,7 +533,7 @@ Document::Ptr Document::create(const FilePath &filePath)
void Document::setUtf8Source(const QByteArray &source)
{
_source = source;
_translationUnit->setSource(_source.constBegin(), _source.size());
_translationUnit->setSource(_source.constData(), _source.size());
}
LanguageFeatures Document::languageFeatures() const