feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge "Merge remote-tracking branch 'origin/10.0' into 11.0" into 11.0

Browse Source
This commit is contained in:
The Qt Project
2023-05-30 09:08:27 +00:00
parent afbdad999d e71d7bf454
commit 6bf550e759
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/cppeditor/cpphighlighter.cpp
View File

@@ -76,6 +76,7 @@ void CppHighlighter::highlightBlock(const QString &text)
setFormat(0, text.length(), formatForCategory(C_VISUAL_WHITESPACE)); setFormat(0, text.length(), formatForCategory(C_VISUAL_WHITESPACE));
} }
TextDocumentLayout::setFoldingIndent(currentBlock(), foldingIndent); TextDocumentLayout::setFoldingIndent(currentBlock(), foldingIndent);
TextDocumentLayout::setExpectedRawStringSuffix(currentBlock(), inheritedRawStringSuffix);
return; return;
} }

2
src/plugins/cppeditor/testcases/highlightingtestcase.cpp
View File

@@ -1,7 +1,7 @@
auto func() auto func()
{ {
return R"(foo return R"(foo
foobar
R"notaprefix!( R"notaprefix!(
barfoobar)" R"(second)" /* comment */ R"(third)"; barfoobar)" R"(second)" /* comment */ R"(third)";
} }

2
src/shared/qbs

Submodule src/shared/qbs updated: dc4da2ef8a...eaeba4a45e