diff --git a/src/plugins/clangformat/clangformatbaseindenter.cpp b/src/plugins/clangformat/clangformatbaseindenter.cpp
index 4a3833d5668..371058bac10 100644
--- a/src/plugins/clangformat/clangformatbaseindenter.cpp
+++ b/src/plugins/clangformat/clangformatbaseindenter.cpp
@@ -343,7 +343,7 @@ Utils::Text::Replacements utf16Replacements(const QTextDocument *doc,
                                     .size();
         convertedReplacements.emplace_back(utf16Offset,
                                            utf16Length,
-                                           QString::fromStdString(replacement.getReplacementText()));
+                                           QString::fromStdString(replacement.getReplacementText().str()));
     }
 
     return convertedReplacements;
diff --git a/src/plugins/clangformat/clangformatutils.cpp b/src/plugins/clangformat/clangformatutils.cpp
index 0a32d3a9297..e0eb2827c4a 100644
--- a/src/plugins/clangformat/clangformatutils.cpp
+++ b/src/plugins/clangformat/clangformatutils.cpp
@@ -54,7 +54,11 @@ static clang::format::FormatStyle qtcStyle()
     style.AlignConsecutiveAssignments = false;
     style.AlignConsecutiveDeclarations = false;
     style.AlignEscapedNewlines = FormatStyle::ENAS_DontAlign;
+#if LLVM_VERSION_MAJOR >= 11
+    style.AlignOperands = FormatStyle::OAS_Align;
+#else
     style.AlignOperands = true;
+#endif
     style.AlignTrailingComments = true;
     style.AllowAllParametersOfDeclarationOnNextLine = true;
 #if LLVM_VERSION_MAJOR >= 10