16 lines
939 B
Diff
16 lines
939 B
Diff
|
diff -rupN --no-dereference qt-creator-opensource-src-14.0.2/src/plugins/clangformat/clangformatutils.cpp qt-creator-opensource-src-14.0.2-new/src/plugins/clangformat/clangformatutils.cpp
|
||
|
|
--- qt-creator-opensource-src-14.0.2/src/plugins/clangformat/clangformatutils.cpp 2024-09-27 03:17:48.000000000 +0200
|
||
|
|
+++ qt-creator-opensource-src-14.0.2-new/src/plugins/clangformat/clangformatutils.cpp 2024-10-04 11:43:19.140491504 +0200
|
||
|
|
@@ -117,7 +117,11 @@ clang::format::FormatStyle calculateQtcS
|
||
|
|
style.IndentWrappedFunctionNames = false;
|
||
|
|
style.JavaScriptQuotes = FormatStyle::JSQS_Leave;
|
||
|
|
style.JavaScriptWrapImports = true;
|
||
|
|
+#if LLVM_VERSION_MAJOR >= 19
|
||
|
|
+ style.KeepEmptyLines = {false, false, false};
|
||
|
|
+#else
|
||
|
|
style.KeepEmptyLinesAtTheStartOfBlocks = false;
|
||
|
|
+#endif
|
||
|
|
// Do not add QT_BEGIN_NAMESPACE/QT_END_NAMESPACE as this will indent lines in between.
|
||
|
|
style.MacroBlockBegin = "";
|
||
|
|
style.MacroBlockEnd = "";
|