aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/images/qtcreator-clang-code-model-build-settings.pngbin0 -> 43490 bytes
-rw-r--r--doc/images/qtcreator-clang-code-model-options.pngbin16323 -> 58844 bytes
-rw-r--r--doc/src/editors/creator-clang-codemodel.qdoc41
3 files changed, 29 insertions, 12 deletions
diff --git a/doc/images/qtcreator-clang-code-model-build-settings.png b/doc/images/qtcreator-clang-code-model-build-settings.png
new file mode 100644
index 0000000000..cc7d3d8cf9
--- /dev/null
+++ b/doc/images/qtcreator-clang-code-model-build-settings.png
Binary files differ
diff --git a/doc/images/qtcreator-clang-code-model-options.png b/doc/images/qtcreator-clang-code-model-options.png
index ff9e367c02..c48856a201 100644
--- a/doc/images/qtcreator-clang-code-model-options.png
+++ b/doc/images/qtcreator-clang-code-model-options.png
Binary files differ
diff --git a/doc/src/editors/creator-clang-codemodel.qdoc b/doc/src/editors/creator-clang-codemodel.qdoc
index cdb7c2d2d1..24cf8be38d 100644
--- a/doc/src/editors/creator-clang-codemodel.qdoc
+++ b/doc/src/editors/creator-clang-codemodel.qdoc
@@ -129,14 +129,29 @@
\image qtcreator-clang-code-model-options.png
- \li In the \uicontrol {Configuration to use} list, configure the
- diagnostics that Clang should issue.
+ \li To instruct the code model to interpret ambiguous header files as C
+ language files if you develop mainly using C, select the
+ \uicontrol {Interpret ambiguous headers as C headers} check box.
+
+ \li To process pre-compiled headers, deselect the
+ \uicontrol {Ignore pre-compiled headers} check box.
- You can either select one of the predefined configurations, or
- create a copy of a configuration and edit it to fit your needs:
+ \li To avoid out-of-memory crashes caused by indexing huge source files
+ that are typically auto-generated by scripts or code, the size of
+ files to index is limited to 5MB by default. To adjust the limit,
+ edit the value for the \uicontrol {Do not index files greater than}
+ check box. To index all files, deselect the check box.
+
+ \li In the \uicontrol {Clang Code Model Warnings} group, configure the
+ diagnostics that Clang should issue.
\list
+ \li In the \uicontrol {Configuration to use} list, select one of
+ the predefined configurations, or select \uicontrol Copy to
+ create a copy of a configuration and edit it to fit your
+ needs.
+
\li \uicontrol {Pedantic Warnings} uses the \c -Wpendantic
option that requests all the warnings demanded by strict
ISO C and ISO C++.
@@ -160,15 +175,17 @@
{Options to Request or Suppress Warnings} or the GCC or Clang
manual pages.
- \li To process pre-compiled headers, deselect the
- \uicontrol {Ignore pre-compiled headers} check box.
+ \endlist
- \li To avoid out-of-memory crashes caused by indexing huge source files
- that are typically auto-generated by scripts or code, the size of
- files to index is limited to 5MB by default. To adjust the limit,
- edit the value for the \uicontrol {Do not index files greater than}
- check box. To index all files, deselect the check box.
+ You can specify Clang settings at project level in the build settings of
+ the project by selecting \uicontrol Projects >
+ \uicontrol {Clang Code Model}. In addition to configuring the diagnostics,
+ you can select the \uicontrol {Enable MSVC-compliant template parsing} check
+ box to parse templates in a MSVC-compliant way. This enables Clang to parse
+ headers for example from Active Template Library (ATL) or Windows Runtime
+ Library (WRL). However, using the relaxed and extended rules means that no
+ highlighting or completion can be provided within template functions.
- \endlist
+ \image qtcreator-clang-code-model-build-settings.png
*/