diff options
| author | Leena Miettinen <riitta-leena.miettinen@digia.com> | 2014-11-25 10:33:53 +0100 |
|---|---|---|
| committer | Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> | 2014-11-25 11:09:31 +0100 |
| commit | 09bfbf70e891d313cb84c5fa12aa362a785d4b66 (patch) | |
| tree | 4f11f422652c87a2077541db46fab1a12db43f01 /doc/src | |
| parent | 9c3f5dd3a43a5e62e4c4dc9f64a24727fa5402db (diff) | |
| download | qt-creator-09bfbf70e891d313cb84c5fa12aa362a785d4b66.tar.gz | |
Doc: update info about other build systems than qmake
Change-Id: Ie836c97bd6b87e9122b5d9f7be1f078ebbca4d8b
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/overview/creator-overview.qdoc | 3 | ||||
| -rw-r--r-- | doc/src/projects/creator-projects-other.qdoc | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/src/overview/creator-overview.qdoc b/doc/src/overview/creator-overview.qdoc index 792c54bd3d..fdae1cc685 100644 --- a/doc/src/overview/creator-overview.qdoc +++ b/doc/src/overview/creator-overview.qdoc @@ -80,7 +80,8 @@ \li \b {\l{Building and Running}} \QC is integrated with cross-platform systems for build - automation: qmake and CMake. In addition, you can import + automation: qmake, Qbs, CMake, and Autotools. In addition, you + can import projects as \e {generic projects} and fully control the steps and commands used to build the project. diff --git a/doc/src/projects/creator-projects-other.qdoc b/doc/src/projects/creator-projects-other.qdoc index 85aab3d67f..b363458c97 100644 --- a/doc/src/projects/creator-projects-other.qdoc +++ b/doc/src/projects/creator-projects-other.qdoc @@ -31,7 +31,9 @@ \title Using Other Build Systems \QC project wizards create projects that are configured to use qmake. Most - of the instructions in this manual apply to using qmake. + of the instructions in this manual apply to using qmake. However, \QC is + also integrated to other build systems, as described in the the following + sections: \list |