diff --git a/doc/images/qtcreator-code-style-clang-format.png b/doc/images/qtcreator-code-style-clang-format.png index f44c0ea47b7..d803d551a16 100644 Binary files a/doc/images/qtcreator-code-style-clang-format.png and b/doc/images/qtcreator-code-style-clang-format.png differ diff --git a/doc/images/qtcreator-code-style-settings-edit-cpp.png b/doc/images/qtcreator-code-style-settings-edit-cpp.png index 3d15ac12e48..ff52a41b8f3 100644 Binary files a/doc/images/qtcreator-code-style-settings-edit-cpp.png and b/doc/images/qtcreator-code-style-settings-edit-cpp.png differ diff --git a/doc/images/qtcreator-code-style-settings-edit-qtquick.png b/doc/images/qtcreator-code-style-settings-edit-qtquick.png index 0063f69e595..276ce1cbab0 100644 Binary files a/doc/images/qtcreator-code-style-settings-edit-qtquick.png and b/doc/images/qtcreator-code-style-settings-edit-qtquick.png differ diff --git a/doc/images/qtcreator-projects-code-style.png b/doc/images/qtcreator-projects-code-style.png new file mode 100644 index 00000000000..90fb3b4fcd6 Binary files /dev/null and b/doc/images/qtcreator-projects-code-style.png differ diff --git a/doc/src/editors/creator-clangformat.qdocinc b/doc/src/editors/creator-clangformat.qdocinc index 8a4b7573992..705f4067bb1 100644 --- a/doc/src/editors/creator-clangformat.qdocinc +++ b/doc/src/editors/creator-clangformat.qdocinc @@ -28,7 +28,7 @@ \section2 Automatic Formatting and Indentation - The experimental Clang Format plugin uses the + The Clang Format plugin uses the \l{https://clang.llvm.org/docs/LibFormat.html}{LibFormat} library for automatic formatting and indentation. diff --git a/doc/src/projects/creator-only/creator-projects-settings-code-style.qdoc b/doc/src/projects/creator-only/creator-projects-settings-code-style.qdoc index 4e3841b4d23..525e7965f4a 100644 --- a/doc/src/projects/creator-only/creator-projects-settings-code-style.qdoc +++ b/doc/src/projects/creator-only/creator-projects-settings-code-style.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -48,6 +48,16 @@ switch between them. In addition, you can import and export code style settings. + \image qtcreator-projects-code-style.png "Code Style settings in Projects mode" + + Alternatively, you can enable the Clang Format plugin to enforce + the code style specified in a \c {.clang-format} file. It uses the + \l{https://clang.llvm.org/docs/LibFormat.html}{LibFormat} library for + automatic code formatting and indentation. For more information, see + \l {Automatic Formatting and Indentation}. + + \image qtcreator-code-style-clang-format.png "Clang Format Code Style settings in Projects mode" + To specify global code style settings sets for C++ files, select \uicontrol {Tools > Options > C++}.