summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@digia.com>2013-11-08 12:08:01 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-11-08 12:34:29 +0100
commit8556ed5c32c927748deef6783cca34e39238e691 (patch)
tree59f3fe8cc6b48b73043a1ded635ed0df942d1e04
parent359f52443707f635b4493ffbbb561ad0402a24fc (diff)
Doc: add link to Qbs Manual to the Development Tools topic
Change-Id: I095753ca4531d524100f8d659f0fcf6a40fc6a4e Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
-rw-r--r--doc/src/developmenttools.qdoc7
-rw-r--r--doc/src/external-resources.qdoc5
2 files changed, 9 insertions, 3 deletions
diff --git a/doc/src/developmenttools.qdoc b/doc/src/developmenttools.qdoc
index e48547241..271c52b3b 100644
--- a/doc/src/developmenttools.qdoc
+++ b/doc/src/developmenttools.qdoc
@@ -61,9 +61,10 @@
Qt Designer from Qt Creator in the Design mode (1).
\li \l{qmake Manual}{qmake} for building applications for different
target platforms. You can also use other build automation tools,
- such as \l{CMake Manual}{CMake} or Autotools. You can run qmake and
- CMake from Qt Creator to build applications. You specify the build
- system in the Projects mode (2).
+ such as \l{CMake Manual}{CMake}, \l{Qbs Manual}{Qbs}, or Autotools.
+ When using qmake or CMake, you specify the build system in the
+ Projects mode (2). When using Qbs or Autotools, you open a .qbs or
+ .am file in Qt Creator.
\li \l{Qt Linguist Manual}{Qt Linguist} for localizing applications.
Qt Linguist contains tools for the roles typically involved in
localizing applications: developers, translators, and release
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index 4e3e7524c..f48af1b9e 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -93,3 +93,8 @@
\externalpage http://www.gnu.org/copyleft/fdl.html
\title GNU Free Documentation License
*/
+
+/*!
+ \externalpage http://qt-project.org/doc/qbs/index.html
+ \title Qbs Manual
+*/