diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-07-12 13:56:23 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-07-12 13:56:23 +0200 |
| commit | 90a03391d73034645b85be0d622d5f17d080ebae (patch) | |
| tree | a7e65421be856db997f73353c31d56ad3c69463d /src/plugins/clangformat | |
| parent | d1dbff3e6ff6da7b580f81ce4d0e9fce3acf5eff (diff) | |
| parent | 894a62325a090fe50b19391f39f088c4ba4a29d5 (diff) | |
Merge remote-tracking branch 'origin/8.0'
Change-Id: I37a1f78caf9ae258c6b052efa3be15b3dbcbe164
Diffstat (limited to 'src/plugins/clangformat')
| -rw-r--r-- | src/plugins/clangformat/clangformatfile.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/clangformat/clangformatfile.cpp b/src/plugins/clangformat/clangformatfile.cpp index 192bb47cb8..ef96f26ce1 100644 --- a/src/plugins/clangformat/clangformatfile.cpp +++ b/src/plugins/clangformat/clangformatfile.cpp @@ -186,6 +186,8 @@ void ClangFormatFile::fromCppCodeStyleSettings(const CppEditor::CppCodeStyleSett if (settings.indentNamespaceBody || settings.indentNamespaceBraces) m_style.NamespaceIndentation = FormatStyle::NamespaceIndentationKind::NI_All; + else + m_style.NamespaceIndentation = FormatStyle::NamespaceIndentationKind::NI_None; if (settings.indentClassBraces || settings.indentEnumBraces || settings.indentBlockBraces || settings.indentFunctionBraces) |