diff options
author | Leena Miettinen <riitta-leena.miettinen@nokia.com> | 2012-08-31 11:33:23 +0200 |
---|---|---|
committer | Leena Miettinen <riitta-leena.miettinen@nokia.com> | 2012-08-31 13:42:43 +0200 |
commit | 92113a8bb59aaab801e608e0c03216a08b08f9fb (patch) | |
tree | d33313384c74ffd213ba5a83e1e7ca82d9e29fa7 /doc | |
parent | 7dc7907cb830a7e0a65a11aaf4165bb51b9d6c06 (diff) |
Doc: Tool Chain tab was renamed as Compiler tab
Fields were also renamed accordingly.
Change-Id: I2f2658cdca2293c10c73d967fe66d520cb6de4d0
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Diffstat (limited to 'doc')
-rw-r--r-- | doc/images/qtcreator-cmakeexecutable.png | bin | 3949 -> 3517 bytes | |||
-rw-r--r-- | doc/images/qtcreator-qt4-qtversions-add.png | bin | 11952 -> 14438 bytes | |||
-rw-r--r-- | doc/images/qtcreator-run-settings-linux-devices.png | bin | 15007 -> 14989 bytes | |||
-rw-r--r-- | doc/images/qtcreator-targets.png | bin | 14163 -> 14117 bytes | |||
-rw-r--r-- | doc/images/qtcreator-toolchains.png | bin | 12063 -> 12744 bytes | |||
-rw-r--r-- | doc/src/linux-mobile/linuxdev.qdoc | 24 | ||||
-rw-r--r-- | doc/src/projects/creator-projects-opening.qdoc | 2 | ||||
-rw-r--r-- | doc/src/projects/creator-projects-targets.qdoc | 6 |
8 files changed, 14 insertions, 18 deletions
diff --git a/doc/images/qtcreator-cmakeexecutable.png b/doc/images/qtcreator-cmakeexecutable.png Binary files differindex 70265cd230..1f2244f588 100644 --- a/doc/images/qtcreator-cmakeexecutable.png +++ b/doc/images/qtcreator-cmakeexecutable.png diff --git a/doc/images/qtcreator-qt4-qtversions-add.png b/doc/images/qtcreator-qt4-qtversions-add.png Binary files differindex 2857a28bd8..6c7c201c18 100644 --- a/doc/images/qtcreator-qt4-qtversions-add.png +++ b/doc/images/qtcreator-qt4-qtversions-add.png diff --git a/doc/images/qtcreator-run-settings-linux-devices.png b/doc/images/qtcreator-run-settings-linux-devices.png Binary files differindex 533b51fa76..47be61e81a 100644 --- a/doc/images/qtcreator-run-settings-linux-devices.png +++ b/doc/images/qtcreator-run-settings-linux-devices.png diff --git a/doc/images/qtcreator-targets.png b/doc/images/qtcreator-targets.png Binary files differindex d1e63ee8d2..80022ad0e9 100644 --- a/doc/images/qtcreator-targets.png +++ b/doc/images/qtcreator-targets.png diff --git a/doc/images/qtcreator-toolchains.png b/doc/images/qtcreator-toolchains.png Binary files differindex 8f38f27369..0d4f8c854d 100644 --- a/doc/images/qtcreator-toolchains.png +++ b/doc/images/qtcreator-toolchains.png diff --git a/doc/src/linux-mobile/linuxdev.qdoc b/doc/src/linux-mobile/linuxdev.qdoc index 30edb8535e..9605027606 100644 --- a/doc/src/linux-mobile/linuxdev.qdoc +++ b/doc/src/linux-mobile/linuxdev.qdoc @@ -47,7 +47,8 @@ either a password or an SSH key. If you do not have an SSH key, you can create it in \QC. For more information, see \l {Generating SSH Keys}. - To configure connections between \QC and embedded Linux devices: + To configure connections between \QC and an embedded Linux device and to + specify build and run settings for the device: \list 1 @@ -90,6 +91,10 @@ \endlist + \o Select \gui Tools > \gui Options > \gui {Build & Run} > \gui Targets + > \gui Add to add a target for building for the device. Select the + Qt version, compiler, and device that you added above. + \o To specify build settings: \list 1 @@ -97,26 +102,17 @@ \o Open a project for an application you want to develop for the device. - \o Select \gui {Projects > Desktop > Build}. + \o Select \gui {Projects > Targets > Add}. - \o Select the Qt version and tool chain for the embedded Linux - device. + \o Select the target that you added above. \endlist - \o To specify run settings: - - \list 1 - - \o Select \gui {Run > Add > Deploy to Remote Linux Host} - to add a new deploy configuration. + \o To specify run settings, select \gui Run. \image qtcreator-run-settings-linux-devices.png "Run settings for embedded Linux devices" - \o In the \gui {Device configuration} field, select the device - connection. - - \endlist + Usually, you can use the default settings. When you run the project, \QC deploys the application as specified by the deploy steps. By default, \QC copies the application files to the device. diff --git a/doc/src/projects/creator-projects-opening.qdoc b/doc/src/projects/creator-projects-opening.qdoc index dd825a89a2..6d30ba4f4d 100644 --- a/doc/src/projects/creator-projects-opening.qdoc +++ b/doc/src/projects/creator-projects-opening.qdoc @@ -47,7 +47,7 @@ \image qtcreator-open-project-targets.png "Configure Project tab" Even if you do not intend to build the project, the C++ and QML code models - need a Qt version and tool chain to offer code completion. To specify them, + need a Qt version and compiler to offer code completion. To specify them, select the \gui Options link, or select \gui {Tools > Options > Build & Run > Targets}. diff --git a/doc/src/projects/creator-projects-targets.qdoc b/doc/src/projects/creator-projects-targets.qdoc index 34005fa0af..6cadd5cdbb 100644 --- a/doc/src/projects/creator-projects-targets.qdoc +++ b/doc/src/projects/creator-projects-targets.qdoc @@ -33,7 +33,7 @@ \QC groups platform specific settings as \e targets to make cross-platform development easier. Each target consists of a set of values that define one - environment, such as a device, tool chain, Qt version, and debugger command + environment, such as a device, compiler, Qt version, and debugger command to use, and some metadata, such as an icon and a name for the target. Once you have defined targets, you can select them to build and run projects. @@ -85,8 +85,8 @@ image is located. If you are not cross-compiling, leave this field empty. - \o In the \gui {Tool chain} field, select the tool chain required - to build the project. You can add tool chains to the list + \o In the \gui {Compiler} field, select the compiler required + to build the project. You can add compilers to the list if they are installed on the development PC, but were not detected automatically. For more information, see \l{Adding Compilers}. |