summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2020-03-23 17:21:04 +0100
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2020-03-24 08:11:10 +0000
commit9bf8610935bdce667708299911a20b84154cf412 (patch)
tree6c515cf2edb4c2bb1480c9f292b65e2c786b93d1 /doc
parent0876926db427ad4ff82b0c093ce8b667a7c61134 (diff)
downloadqt-creator-9bf8610935bdce667708299911a20b84154cf412.tar.gz
Doc: Update info on automatically registering CMake help
Change-Id: Icdc010102055def6b87902c0c924f647f1f408da Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'doc')
-rwxr-xr-x[-rw-r--r--]doc/qtcreator/images/qtcreator-cmakeexecutable.pngbin13050 -> 13755 bytes
-rw-r--r--doc/qtcreator/src/cmake/creator-projects-cmake.qdoc9
2 files changed, 8 insertions, 1 deletions
diff --git a/doc/qtcreator/images/qtcreator-cmakeexecutable.png b/doc/qtcreator/images/qtcreator-cmakeexecutable.png
index b98085b4e0..5c57588762 100644..100755
--- a/doc/qtcreator/images/qtcreator-cmakeexecutable.png
+++ b/doc/qtcreator/images/qtcreator-cmakeexecutable.png
Binary files differ
diff --git a/doc/qtcreator/src/cmake/creator-projects-cmake.qdoc b/doc/qtcreator/src/cmake/creator-projects-cmake.qdoc
index a6d0ad6671..af8c130105 100644
--- a/doc/qtcreator/src/cmake/creator-projects-cmake.qdoc
+++ b/doc/qtcreator/src/cmake/creator-projects-cmake.qdoc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2019 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Creator documentation.
@@ -50,6 +50,10 @@
You can add paths to other CMake executables and use them in different
build and run \l{glossary-buildandrun-kit}{kits}.
+ CMake documentation is installed in Qt help file format (.qch) when you
+ install CMake. It is automatically registered by \QC, and you can view it
+ in the Help mode.
+
\QC automatically runs CMake to refresh project information when you edit
a \c CMakeLists.txt configuration file in a project. Project information is
also automatically refreshed when you build the project.
@@ -79,6 +83,9 @@
\li In the \uicontrol Path field, specify the path to the CMake
executable.
+ \li In the \uicontrol {Help file} field, specify the path to the
+ CMake help file (.qch) provided by and installed with CMake.
+
\li Select the \uicontrol {Auto-create build directories} check box to
automatically create build directories for CMake projects.