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

Change-Id: I110bc26f4469093d262a77c27623ad1dddd1b7c1

3 files changed, 2 insertions, 1 deletions

diff --git a/src/plugins/cppeditor/cpphighlighter.cpp b/src/plugins/cppeditor/cpphighlighter.cpp
index 87e36491ad..f5ef94efde 100644
--- a/src/plugins/cppeditor/cpphighlighter.cpp
+++ b/src/plugins/cppeditor/cpphighlighter.cpp
@@ -76,6 +76,7 @@ void CppHighlighter::highlightBlock(const QString &text)
                 setFormat(0, text.length(), formatForCategory(C_VISUAL_WHITESPACE));
         }
         TextDocumentLayout::setFoldingIndent(currentBlock(), foldingIndent);
+        TextDocumentLayout::setExpectedRawStringSuffix(currentBlock(), inheritedRawStringSuffix);
         return;
     }
 
diff --git a/src/plugins/cppeditor/testcases/highlightingtestcase.cpp b/src/plugins/cppeditor/testcases/highlightingtestcase.cpp
index dd1f9c1b3e..53ffcc1b55 100644
--- 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)";
 }
diff --git a/src/shared/qbs b/src/shared/qbs
-Subproject dc4da2ef8aaf63ab837da0aa7689a5b18e34ace
+Subproject eaeba4a45e7d95b7bb3f4fe907e862d947faf09