Merge remote-tracking branch 'origin/11.0'

Change-Id: Ibe5040142ca38fed77ffed163212baf22592e392
This commit is contained in:
Eike Ziller
2023-08-04 14:57:29 +02:00
6 changed files with 51 additions and 17 deletions

View File

@@ -843,7 +843,7 @@ bool TextDocument::reload(QString *errorString, const FilePath &realFilePath)
auto documentLayout =
qobject_cast<TextDocumentLayout*>(d->m_document.documentLayout());
if (documentLayout)
documentLayout->documentAboutToReload(); // removes text marks non-permanently
documentLayout->documentAboutToReload(this); // removes text marks non-permanently
bool success = openImpl(errorString, filePath(), realFilePath, /*reload =*/true)
== OpenResult::Success;