aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@nokia.com>2012-08-24 08:31:01 +0200
committerhjk <qthjk@ovi.com>2012-08-24 09:26:51 +0200
commit5a895d4fe5935bae85c1cec22ba56874945d9b10 (patch)
tree7082c83b37e41cf33f781f32f39093e5fdb5004b /doc
parenta110c98d08ef558d6f0bb614a347bccc1c02c782 (diff)
Rename "Tool Chains" option page to "Compilers"
Currently it contains compiler settings only, so there's no need to let people search for e.g. debugger settings there, that might be considered part of the toolchain, too. Change-Id: I458f3d1cf1784b85820f8af7604a2a004372a909 Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/src/linux-mobile/linuxdev.qdoc6
-rw-r--r--doc/src/projects/creator-projects-compilers.qdoc (renamed from doc/src/projects/creator-projects-tool-chains.qdoc)4
-rw-r--r--doc/src/projects/creator-projects-settings-build.qdoc2
-rw-r--r--doc/src/projects/creator-projects-targets.qdoc2
-rw-r--r--doc/src/qtcreator.qdoc2
5 files changed, 8 insertions, 8 deletions
diff --git a/doc/src/linux-mobile/linuxdev.qdoc b/doc/src/linux-mobile/linuxdev.qdoc
index e39248eb13..30edb8535e 100644
--- a/doc/src/linux-mobile/linuxdev.qdoc
+++ b/doc/src/linux-mobile/linuxdev.qdoc
@@ -57,9 +57,9 @@
add the Qt version
for the embedded Linux.
- \o Select \gui {Tools > Options > Build & Run > Tool Chains > Add} to
- add the tool
- chain for building the applications.
+ \o Select \gui {Tools > Options > Build & Run > Compilers > Add} to
+ add the compiler
+ for building the applications.
\o To deploy applications and run them remotely on devices, specify
parameters for accessing the devices:
diff --git a/doc/src/projects/creator-projects-tool-chains.qdoc b/doc/src/projects/creator-projects-compilers.qdoc
index 040625fe99..f30c10deb2 100644
--- a/doc/src/projects/creator-projects-tool-chains.qdoc
+++ b/doc/src/projects/creator-projects-compilers.qdoc
@@ -29,7 +29,7 @@
\page creator-tool-chains.html
\nextpage creator-run-settings.html
- \title Adding Tool Chains
+ \title Adding Compilers
A \e {tool chain} specifies a compiler and other necessary
tools for building an application that is \l{glossary-development-target}
@@ -68,7 +68,7 @@
\list 1
- \o Select \gui {Tools > Options > Build & Run > Tool Chains > Add} and
+ \o Select \gui {Tools > Options > Build & Run > Compilers > Add} and
select a
compiler in the list.
diff --git a/doc/src/projects/creator-projects-settings-build.qdoc b/doc/src/projects/creator-projects-settings-build.qdoc
index 293e7f0021..8e5e1d7a0f 100644
--- a/doc/src/projects/creator-projects-settings-build.qdoc
+++ b/doc/src/projects/creator-projects-settings-build.qdoc
@@ -194,7 +194,7 @@
\o \l{Adding Targets}
\o \l{Adding Qt Versions}
- \o \l{Adding Tool Chains}
+ \o \l{Adding Compilers}
\endlist
diff --git a/doc/src/projects/creator-projects-targets.qdoc b/doc/src/projects/creator-projects-targets.qdoc
index e47a409f31..34005fa0af 100644
--- a/doc/src/projects/creator-projects-targets.qdoc
+++ b/doc/src/projects/creator-projects-targets.qdoc
@@ -88,7 +88,7 @@
\o In the \gui {Tool chain} field, select the tool chain required
to build the project. You can add tool chains to the list
if they are installed on the development PC, but were not detected
- automatically. For more information, see \l{Adding Tool Chains}.
+ automatically. For more information, see \l{Adding Compilers}.
\o In the \gui {Debugger command} field, specify the path to the
debugger command. On Windows, specify the path to the Windows
diff --git a/doc/src/qtcreator.qdoc b/doc/src/qtcreator.qdoc
index 01fcb0e740..0e8d3214af 100644
--- a/doc/src/qtcreator.qdoc
+++ b/doc/src/qtcreator.qdoc
@@ -171,7 +171,7 @@
\list
\o \l{Adding Targets}
\o \l{Adding Qt Versions}
- \o \l{Adding Tool Chains}
+ \o \l{Adding Compilers}
\endlist
\o \l{Specifying Run Settings}
\o \l{Specifying Editor Settings}