aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2018-06-25 10:28:12 +0200
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2018-06-25 13:50:00 +0000
commitef40f8445e1fee91753659e88d81cbf5c8045f1a (patch)
tree4dae2a50eccc439e76c2ef152a5e5c53411d9200 /doc
parent77c260e14c2a1e661b7ddaf780c798705b998619 (diff)
Doc: Make info about managing projects more generic
The details are described in the listed topics. Change-Id: I243eb8dc102ef42030a1a2e1b28af2679e6ca631 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'doc')
-rw-r--r--doc/src/projects/creator-projects-overview.qdoc23
-rw-r--r--doc/src/projects/creator-projects-settings-build.qdoc5
2 files changed, 13 insertions, 15 deletions
diff --git a/doc/src/projects/creator-projects-overview.qdoc b/doc/src/projects/creator-projects-overview.qdoc
index acef8158eb..b002fae0e9 100644
--- a/doc/src/projects/creator-projects-overview.qdoc
+++ b/doc/src/projects/creator-projects-overview.qdoc
@@ -39,9 +39,9 @@
\image creator_managingprojects.png
- One of the major advantages of \QC is that it allows a team of developers
- to share a project across different development platforms with a common tool
- for development and debugging.
+ One of the major advantages of \QC is that it allows a team of designers and
+ developers to share a project across different development platforms with a
+ common tool for design, development, and debugging.
\list
@@ -55,21 +55,14 @@
\li \l{Using Version Control Systems}
The recommended way to set up a project is to use a version control
- system. Store and edit only project source files and build system
- configuration files (for example, .pro and .pri files for qmake).
- Do not store files generated by the build system or \QC, such as
- makefiles, .pro.user, and object files.
+ system. Store and edit only project source files and configuration
+ files. Do not store generated files.
\li \l{Configuring Projects}
- \QC allows you to specify separate build settings for each
- development platform. By default, \l{glossary-shadow-build}
- {shadow builds} are used to keep the build specific files separate
- from the source. You can create separate versions of project files
- to keep platform-dependent code separate. You can use qmake
- \l{Adding Platform Specific Source Files}
- {scopes} to select the file to process depending on which platform
- qmake is run on.
+ Installation programs and project wizards create default
+ configurations for \QC and your projects. You can modify
+ the settings in the Projects mode.
\li \l{Managing Sessions}
diff --git a/doc/src/projects/creator-projects-settings-build.qdoc b/doc/src/projects/creator-projects-settings-build.qdoc
index 8eaf3dbb82..81471b2cc7 100644
--- a/doc/src/projects/creator-projects-settings-build.qdoc
+++ b/doc/src/projects/creator-projects-settings-build.qdoc
@@ -75,6 +75,11 @@
\uicontrol General, and enter a period (.) in the
\uicontrol {Default build directory} field.
+ You can create separate versions of project files to keep platform-dependent
+ code separate. You can use qmake \l{Adding Platform Specific Source Files}
+ {scopes} to select the file to process depending on which platform qmake is
+ run on.
+
\include creator-projects-cmake-building.qdocinc cmake build configuration
\section1 Starting External Processes