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

Change-Id: I110bc26f4469093d262a77c27623ad1dddd1b7c1
2023-05-30 10:52:47 +02:00
parent aa2e8e3cb8 13e9125d1d
commit e71d7bf454
3 changed files with 3 additions and 2 deletions
--- a/src/plugins/cppeditor/testcases/highlightingtestcase.cpp
+++ b/src/plugins/cppeditor/testcases/highlightingtestcase.cpp
@@ -1,7 +1,7 @@
 auto func()
 {
    return R"(foo
-    foobar
+
        R"notaprefix!(
    barfoobar)" R"(second)" /* comment */ R"(third)";
 }