diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2022-07-01 11:19:21 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2022-07-01 09:22:10 +0000 |
| commit | 56bcad81adb7268773b902ece0fc065d01f3db27 (patch) | |
| tree | ad19b5f8f6bbeeedffcde2549bd83ab0ac0d25d1 /src/plugins/cppeditor/cppeditordocument.cpp | |
| parent | a920bbf59fb071af2e6bfb306dec07bb8ba94924 (diff) | |
| parent | 234958a47a6edcd17bae255411a5b0f0bbaea6c7 (diff) | |
Merge remote-tracking branch 'origin/7.0' into 8.0
Change-Id: I7cd5d3808007ef739212f4347ba9b16e7b298943
Diffstat (limited to 'src/plugins/cppeditor/cppeditordocument.cpp')
| -rw-r--r-- | src/plugins/cppeditor/cppeditordocument.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/cppeditor/cppeditordocument.cpp b/src/plugins/cppeditor/cppeditordocument.cpp index 80a8cce0bd..2b01b86c27 100644 --- a/src/plugins/cppeditor/cppeditordocument.cpp +++ b/src/plugins/cppeditor/cppeditordocument.cpp @@ -473,7 +473,7 @@ bool CppEditorDocument::save(QString *errorString, const FilePath &filePath, boo if (!editedRanges.empty()) { QTextCursor cursor(document()); - cursor.beginEditBlock(); + cursor.joinPreviousEditBlock(); indenter()->format(editedRanges); cursor.endEditBlock(); } |