Merge remote-tracking branch 'origin/qds/dev'

Change-Id: I5d593fc74785958886453dc0b452c25356a8c65f

src/plugins/clangformat/clangformatbaseindenter.cpp

@@ -389,6 +389,7 @@ Utils::ChangeSet convertReplacements(const QTextDocument *doc,
                               .size();
 
         QString replacementText = QString::fromStdString(replacement.getReplacementText().str());
+        replacementText.replace("\r", "");
         auto sameCharAt = [&](int replacementOffset) {
             if (replacementText.size() <= replacementOffset || replacementOffset < 0)
                 return false;