diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-04-26 10:16:38 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-04-26 10:16:38 +0200 |
| commit | 531fba61f0349c6b0eedc3b2e832f76a76c8be94 (patch) | |
| tree | 9cc14675daa0640278d452ec6b56e4a35ee76e10 /doc | |
| parent | 73f2c0f4e825f5f393c3c2aea13dc770728deef9 (diff) | |
| parent | b6bf1fdf38e5c71bf5c8a3540e30c70462c9b1b2 (diff) | |
Merge remote-tracking branch 'origin/4.3'
Change-Id: Ie18d823d0940113e8a78c81204b7a7ca07a060ba
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/images/qtcreator-cmake-build-settings.png | bin | 25118 -> 43035 bytes | |||
| -rw-r--r-- | doc/src/cmake/creator-projects-cmake-building.qdocinc | 5 |
2 files changed, 5 insertions, 0 deletions
diff --git a/doc/images/qtcreator-cmake-build-settings.png b/doc/images/qtcreator-cmake-build-settings.png Binary files differindex 2c2af74c6d..b099dd05b9 100644 --- a/doc/images/qtcreator-cmake-build-settings.png +++ b/doc/images/qtcreator-cmake-build-settings.png diff --git a/doc/src/cmake/creator-projects-cmake-building.qdocinc b/doc/src/cmake/creator-projects-cmake-building.qdocinc index 81c7925625..7ee79eef32 100644 --- a/doc/src/cmake/creator-projects-cmake-building.qdocinc +++ b/doc/src/cmake/creator-projects-cmake-building.qdocinc @@ -38,12 +38,17 @@ To view all settings, select the \uicontrol Advanced check box. + To add build settings, select \uicontrol Add, and then select the type of + the setting that you are adding: \uicontrol Boolean, \uicontrol String, + \uicontrol Directory, or \uicontrol File. + To modify the value of a build setting, select it, and then select \uicontrol Edit. The new value is displayed in italics until you save the changes by selecting \uicontrol {Apply Configuration Changes}. Any configuration change might trigger a follow-up configuration change, so keep saving until no more values are displayed in italics. + To reset the changes that you made, select \uicontrol Reset. //! [cmake build configuration] |
