summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2016-08-03 10:10:32 +0200
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2016-08-03 09:04:24 +0000
commit715378c2e6767b39be0e6cb4bc3bac7cbbd4c539 (patch)
tree1917298089c07ccc0276c64130783c2ef61d825e
parentfeb3d6a864638cb9e95c43df13aa21f5f2c0314a (diff)
downloadqt-creator-715378c2e6767b39be0e6cb4bc3bac7cbbd4c539.tar.gz
Doc: Describe Autorun CMake check box in CMake options
Update the screenshot. Change-Id: I3d0970b0f9dd9ff92f19e67c19de824f03859d76 Task-number: QTCREATORBUG-15934 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
-rw-r--r--doc/images/qtcreator-cmakeexecutable.pngbin11981 -> 9854 bytes
-rw-r--r--doc/src/projects/creator-projects-cmake.qdoc11
2 files changed, 11 insertions, 0 deletions
diff --git a/doc/images/qtcreator-cmakeexecutable.png b/doc/images/qtcreator-cmakeexecutable.png
index c50c05a20b..d7d1b7fd85 100644
--- a/doc/images/qtcreator-cmakeexecutable.png
+++ b/doc/images/qtcreator-cmakeexecutable.png
Binary files differ
diff --git a/doc/src/projects/creator-projects-cmake.qdoc b/doc/src/projects/creator-projects-cmake.qdoc
index 1ccf4f55fd..6ec2d3f723 100644
--- a/doc/src/projects/creator-projects-cmake.qdoc
+++ b/doc/src/projects/creator-projects-cmake.qdoc
@@ -47,6 +47,13 @@
You can add paths to other CMake executables and use them in different
build and run \l{glossary-buildandrun-kit}{kits}.
+ \QC automatically runs CMake to regenerate makefiles when you edit a
+ \c CMakeLists.txt configuration file in a project. If the project uses
+ several configuration files, you can disable the automatic generation of
+ makefiles by selecting \uicontrol Tools > \uicontrol Options >
+ \uicontrol {Build & Run} > \uicontrol CMake. Makefiles are automatically
+ regenerated when you build the project.
+
\section1 Adding CMake Tools
\QC supports CMake version 3.0, or later. For best results you should use
@@ -67,6 +74,10 @@
\li In the \uicontrol Path field, specify the path to the CMake
executable.
+ \li Deselect the \uicontrol {Autorun CMake} check box to prevent \QC
+ from running CMake when you make changes to \c {CMakeLists.txt}
+ files.
+
\li Select \uicontrol Apply to save your changes.
\li Select the \uicontrol Kits tab to add the CMake tool to a build and