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

ClangFormat: Adapt to clang 11 API changes

Browse Source 
Change-Id: Id5d977e56017a80138f2c033e145b67446eff3ab
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2020-06-03 11:11:16 +02:00
parent f392d13419
commit eaea03ba42
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/clangformat/clangformatbaseindenter.cpp
View File

@@ -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;

4
src/plugins/clangformat/clangformatutils.cpp
View File

@@ -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