feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Device type + tool chain + other settings -> Kit

Browse Source 
We called that "Target" before

Change-Id: Ie0d673c643947c26ac2706907f6250fc1739388a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
This commit is contained in:
Eike Ziller
2012-09-03 17:50:37 +02:00
parent fb59a39a78
commit 328d205b62
44 changed files with 201 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
doc/api/first-plugin.qdoc
View File

@@ -39,7 +39,7 @@
your plugin with. your plugin with.
\list 1 \list 1
\o Select \gui{File > New File or Project > Other Qt Project > Qt Creator Plugin > Choose}. \o Select \gui{File > New File or Project > Libraries > Qt Creator Plugin > Choose}.
\image firstplugin-wizard.png "Choose the \QC Plugin Wizard" \image firstplugin-wizard.png "Choose the \QC Plugin Wizard"
@@ -52,12 +52,12 @@
from the project name. You will choose that name later in the wizard. from the project name. You will choose that name later in the wizard.
Continue to the next page. Continue to the next page.
The \gui{Target Setup} dialog opens. The \gui{Kit Selection} dialog opens.
\image firstplugin-target.png "Choose the Desktop Target and Matching Qt" \image firstplugin-kitselection.png "Choose the kit to build and run your project with"
\o Select the target and Qt version to build your project with. \o Select the \l{glossary-buildandrun-kit}{kit} to build and run your project with.
For a \QC plugin this needs to be the \gui{Desktop} target, For a \QC plugin this needs to be a kit with \gui{Desktop} device type,
and a Qt version that is compatible with the Qt version that your and a Qt version that is compatible with the Qt version that your
\QC was built with (in the best case the exact same build). \QC was built with (in the best case the exact same build).
If you use an incompatible Qt version to build your plugin, you If you use an incompatible Qt version to build your plugin, you

0
doc/api/images/firstplugin-target.png → doc/api/images/firstplugin-kitselection.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 98 KiB

After

Width:  |  Height:  |  Size: 98 KiB

0
doc/images/qtcreator-target-selector.png → doc/images/qtcreator-kit-selector.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

4
doc/src/analyze/creator-valgrind-overview.qdoc
View File

@@ -37,8 +37,8 @@
to use them from \QC. to use them from \QC.
To run the Valgrind tools on a remote host over SSH, select \gui {Analyze To run the Valgrind tools on a remote host over SSH, select \gui {Analyze
> Valgrind Analyze Memory (Remote)} or \gui {Valgrind Function Profile > Valgrind Analyze Memory (External)} or \gui {Valgrind Function Profile
(Remote)}. (External)}.
To stop the currently running analyzer, select \gui {Analyze To stop the currently running analyzer, select \gui {Analyze
> Stop}. > Stop}.

12
doc/src/analyze/creator-valgrind.qdoc
View File

@@ -252,15 +252,13 @@
\list 1 \list 1
\o Select \gui {Analyze > Valgrind Analyze Memory (Remote)} or \o Select \gui {Analyze > Valgrind Analyze Memory (External)} or
\gui {Valgrind Function Profile (Remote)}. \gui {Valgrind Function Profile (External)}.
\image qtcreator-valgrind-remote-settings.png "Start Debugger dialog" \image qtcreator-valgrind-remote-settings.png "Start Analyzer dialog"
\o In the \gui Remote group, specify the connection to the remote host. \o Specify the application to run and analyze, and the \l{glossary-buildandrun-kit}{kit}
to use.
\o In the \gui Target group, specify the application to run and analyze
on the remote host.
\endlist \endlist

2
doc/src/analyze/qtquick-profiler.qdoc
View File

@@ -87,7 +87,7 @@
\section1 Attaching to Running Qt Quick Applications \section1 Attaching to Running Qt Quick Applications
To profile Qt Quick applications that are not launched by \QC, select To profile Qt Quick applications that are not launched by \QC, select
\gui {Analyze > QML Profiler (Remote)}. You must enable QML debugging for \gui {Analyze > QML Profiler (External)}. You must enable QML debugging for
the application in the project build settings. For more information, see the application in the project build settings. For more information, see
\l{Setting Up QML Debugging}. \l{Setting Up QML Debugging}.

6
doc/src/android/androiddev.qdoc
View File

@@ -32,8 +32,10 @@
and analyze applications on them from \QC. and analyze applications on them from \QC.
If you have a tool chain for building applications for Android devices If you have a tool chain for building applications for Android devices
installed on the development PC, you can add it to \QC. You can then select installed on the development PC, you can add it to \QC. You can then add a
the \gui {Android} target to run applications on Android devices. \l{glossary-buildandrun-kit}{kit}
with the Android device type, the tool chain, and the Qt version for Android,
to build and run applications on Android devices.
\section1 Requirements \section1 Requirements

27
doc/src/debugger/creator-debugger-setup.qdoc
View File

@@ -32,10 +32,10 @@
\title Setting Up Debugger \title Setting Up Debugger
The main debugger settings are associated with the build The main debugger settings are associated with the
\l{glossary-development-target}{target} of your project. To specify the \l{glossary-buildandrun-kit}{kit} you build and run your project with. To specify the
debugger and compiler to use for each build target, select \gui Tools > debugger and compiler to use for each kit, select \gui Tools >
\gui Options > \gui {Build and Run} > \gui Targets. \gui Options > \gui {Build and Run} > \gui Kits.
You need to set up the debugger only if the automatic setup You need to set up the debugger only if the automatic setup
fails, because the native debugger is missing (as is usually the fails, because the native debugger is missing (as is usually the
@@ -45,8 +45,9 @@
want to use a locally installed replacement instead). want to use a locally installed replacement instead).
\note If you need to change the debugger to use for an automatically \note If you need to change the debugger to use for an automatically
detected target, you can \gui{Clone} the target and change the parameters in detected \l{glossary-buildandrun-kit}{kit},
the clone. Make sure to select the cloned target for your project. you can \gui{Clone} the kit and change the parameters in
the clone. Make sure to select the cloned kit for your project.
\note To use the debugging tools for Windows, you must install them \note To use the debugging tools for Windows, you must install them
and add the Symbol Server provided by Microsoft to the symbol search and add the Symbol Server provided by Microsoft to the symbol search
@@ -54,7 +55,7 @@
Server in Windows}. Server in Windows}.
\note To use the Free Software Foundation (FSF) version of GDB on \note To use the Free Software Foundation (FSF) version of GDB on
Mac OS, you must sign it and modify your target settings. Mac OS, you must sign it and modify your \l{glossary-buildandrun-kit}{kit} settings.
This section explains the options you have for debugging C++ code This section explains the options you have for debugging C++ code
and provides installation notes for the supported native debuggers. and provides installation notes for the supported native debuggers.
@@ -185,8 +186,7 @@
\o On Linux and Windows, use the Python-enabled GDB versions that \o On Linux and Windows, use the Python-enabled GDB versions that
are installed when you install \QC and Qt SDK. On Mac OS X, are installed when you install \QC and Qt SDK. On Mac OS X,
use the GDB provided with Xcode. use the GDB provided with Xcode.
For a custom \l{glossary-development-target}{target}, you can You can also build your own Python-enabled GDB. Follow the instructions in
build your own Python-enabled GDB. Follow the instructions in
\l{http://developer.qt.nokia.com/wiki/QtCreatorBuildGdb} \l{http://developer.qt.nokia.com/wiki/QtCreatorBuildGdb}
{Building GDB}. {Building GDB}.
@@ -234,7 +234,7 @@
supports Python from supports Python from
\l{ftp://ftp.qt.nokia.com/misc/gdb/7.2/gdb72_mac_platform.tar.bz2}. \l{ftp://ftp.qt.nokia.com/misc/gdb/7.2/gdb72_mac_platform.tar.bz2}.
To use FSF GDB on Mac OS, you must sign it and add it to the \QC To use FSF GDB on Mac OS, you must sign it and add it to the \QC
targets. For more information, see \l{glossary-buildandrun-kit}{kits}. For more information, see
\l{Setting up FSF GDB for Mac OS}. \l{Setting up FSF GDB for Mac OS}.
\note The Mac OS X Snow Leopard (10.6) has a bug that might cause the \note The Mac OS X Snow Leopard (10.6) has a bug that might cause the
@@ -272,7 +272,8 @@
\section1 Setting up FSF GDB for Mac OS \section1 Setting up FSF GDB for Mac OS
To use FSF GDB on Mac OS, you must sign it and add it to the \QC targets. To use FSF GDB on Mac OS, you must sign it and add it to the \QC
\l{glossary-buildandrun-kit}{kits}.
\list 1 \list 1
@@ -313,13 +314,13 @@
\endcode \endcode
\o In \QC, select \gui {Qt Creator > Preferences > Build & Run > \o In \QC, select \gui {Qt Creator > Preferences > Build & Run >
Targets} > \gui Add to create a build target that uses FSF GDB. Kits} > \gui Add to create a kit that uses FSF GDB.
\o In the \gui Debugger field, specify the path to FSF GDB \o In the \gui Debugger field, specify the path to FSF GDB
(\c $HOME/gdb72/bin/fsfgdb, but with an explicit value for (\c $HOME/gdb72/bin/fsfgdb, but with an explicit value for
\c $HOME). \c $HOME).
\o To use the debugger, add the target in the \gui {Build Settings} \o To use the debugger, add the kit in the \gui {Build Settings}
of the project. of the project.
\endlist \endlist

11
doc/src/debugger/creator-debugger.qdoc
View File

@@ -252,9 +252,9 @@
While this setup might look daunting, it is mostly invisible to While this setup might look daunting, it is mostly invisible to
the user of \QC. To start debugging on a remote target with the the user of \QC. To start debugging on a remote target with the
necessary helper processes running, select the target in necessary helper processes running, select the corresponding
\gui{Projects > Build Settings} \l{glossary-buildandrun-kit}{kit} in
or in the \gui{Debug > Start Debugging} menu. \gui{Projects > Build & Run} or in the \gui{Debug > Start Debugging} menu.
Special use cases, such as attaching to a running process on the Special use cases, such as attaching to a running process on the
target, might still require manual setup. target, might still require manual setup.
@@ -693,8 +693,7 @@
which may contain both release and debug versions of the library. When you run which may contain both release and debug versions of the library. When you run
applications on the Mac OS desktop, the release version of Frameworks is used applications on the Mac OS desktop, the release version of Frameworks is used
by default. To step into Frameworks, select the \gui {Use debug versions of by default. To step into Frameworks, select the \gui {Use debug versions of
Frameworks} option in the project run settings for \gui Desktop and Frameworks} option in the project run settings.
\gui {\QS} targets.
\section2 Viewing Threads \section2 Viewing Threads
@@ -792,7 +791,7 @@
To give the user simple access also to these items, \QC employs To give the user simple access also to these items, \QC employs
so-called Debugging Helpers. Debugging Helpers come in two varieties, so-called Debugging Helpers. Debugging Helpers come in two varieties,
compiled, and Python based, depending on the selected compiled, and Python based, depending on the selected
\l{glossary-development-target}{target}. \l{glossary-buildandrun-kit}{kit}.
By default, Debugging Helpers are automatically and transparently used. By default, Debugging Helpers are automatically and transparently used.
To disable them, select \gui Tools > \gui Options > \gui Debugger > To disable them, select \gui Tools > \gui Options > \gui Debugger >

2
doc/src/debugger/qtquick-debugging.qdoc
View File

@@ -89,7 +89,7 @@
\o To debug applications on devices, check that Qt 4.7.4, or later, \o To debug applications on devices, check that Qt 4.7.4, or later,
libraries are installed on the device and libraries are installed on the device and
\l{Running on Multiple Targets}{select the device as the target} \l{Running on Multiple Targets}{select the corresponding kit for the device}
before you start debugging. before you start debugging.
\endlist \endlist

2
doc/src/howto/creator-keyboard-shortcuts.qdoc
View File

@@ -549,7 +549,7 @@
\o Open project \o Open project
\o Ctrl+Shift+O \o Ctrl+Shift+O
\row \row
\o Select build and run target \o Select the \l{glossary-buildandrun-kit}{kit} to build and run your project with
\o Ctrl+T \o Ctrl+T
\row \row
\o Run \o Run

4
doc/src/howto/creator-ui.qdoc
View File

@@ -51,8 +51,8 @@
You can use the mode selector (1) to change to another \QC mode. You can use the mode selector (1) to change to another \QC mode.
You can use the target selector (2) to select the You can use the kit selector (2) to select the
\l{glossary-development-target}{target} for running (3), debugging (4), or \l{glossary-buildandrun-kit}{kit} for running (3), debugging (4), or
building (5) the application. Output from these actions is displayed in the building (5) the application. Output from these actions is displayed in the
output panes (7). output panes (7).

11
doc/src/linux-mobile/creator-deployment-madde.qdoc
View File

@@ -54,8 +54,8 @@
\image qtcreator-embedded-linux-deployment.png "Deploy to embedded Linux" \image qtcreator-embedded-linux-deployment.png "Deploy to embedded Linux"
When you run the application on the \gui {Embedded Linux} target, \QC When you run the application on the \gui {Embedded Linux} device,
deploys the application as specified by the deploy steps. By default, \QC deploys the application as specified by the deploy steps. By default,
\QC copies the application files to the device by using the SSH file \QC copies the application files to the device by using the SSH file
transfer protocol (SFTP), as specified by the \gui {Upload files via SFTP} transfer protocol (SFTP), as specified by the \gui {Upload files via SFTP}
step. step.
@@ -91,7 +91,7 @@
\section1 Creating Debian Installation Packages \section1 Creating Debian Installation Packages
When you run the application on the \gui{Maemo5} or \gui Harmattan target, When you run the application on the \gui{Maemo5} or \gui Harmattan device,
\QC generates a Debian installation package in the build directory by \QC generates a Debian installation package in the build directory by
default. You can deliver the installation package to users for installation default. You can deliver the installation package to users for installation
on devices that are of the same type and run the same firmware as the on devices that are of the same type and run the same firmware as the
@@ -117,8 +117,9 @@
\note \QC automates this process for you. \note \QC automates this process for you.
\QC provides templates for a set of files that must be included in Debian \QC provides templates for a set of files that must be included in Debian
packages. When you create a \gui Maemo5 or \gui Harmattan target for a packages. When you start using a \l{glossary-buildandrun-kit}{kit} with
project, \QC asks whether packaging files are to be added to the project and \gui Maemo5 or \gui Harmattan device type
for a project, \QC asks whether packaging files are to be added to the project and
to version control. If you plan to edit the packaging files, add them to to version control. If you plan to edit the packaging files, add them to
version control. version control.

7
doc/src/linux-mobile/creator-madde-emulator.qdoc
View File

@@ -57,9 +57,10 @@
\section1 Starting the Emulator \section1 Starting the Emulator
The \gui {Start MeeGo Emulator} button is visible if you have a project The \gui {Start MeeGo Emulator} button is visible if you have a project
open in \QC for which you have added the Maemo or MeeGo Harmattan open in \QC for which you have added a \l{glossary-buildandrun-kit}{kit}
build target. It starts the Maemo or MeeGo Harmattan emulator, depending with Maemo or MeeGo Harmattan device type.
on the selected target. It starts the Maemo or MeeGo Harmattan emulator, depending
on the selected kit.
To start the emulator, click To start the emulator, click
\inlineimage qtcreator-maemo-emulator-button.png "Start MeeGo Emulator button" \inlineimage qtcreator-maemo-emulator-button.png "Start MeeGo Emulator button"

9
doc/src/linux-mobile/creator-projects-settings-run-linux.qdocinc
View File

@@ -1,8 +1,9 @@
\section2 Specifying Run Settings for Linux-Based Devices \section2 Specifying Run Settings for Linux-Based Devices
To run an application on a Linux-based device target (embedded Linux, MeeGo To run an application on a Linux-based device (embedded Linux, MeeGo
Harmattan, or Maemo), create and select a device configuration in the run Harmattan, or Maemo), create and select a device configuration in the
settings for the project. \l{glossary-buildandrun-kit}{kit} that is used for building and running the project and set its
device type correspondingly.
You can also pass command line arguments to your application. You can also pass command line arguments to your application.
\image qtcreator-screenshot-run-settings-maemo.png "Run settings for Linux-based devices" \image qtcreator-screenshot-run-settings-maemo.png "Run settings for Linux-based devices"
@@ -16,7 +17,7 @@
When you run the application, \QC copies the files to the connected device. When you run the application, \QC copies the files to the connected device.
For MeeGo Harmattan and Maemo targets, \QC also generates an For MeeGo Harmattan and Maemo device types, \QC also generates an
installation package in the build directory by default. You can deliver the installation package in the build directory by default. You can deliver the
installation package to users for installation installation package to users for installation
on devices that are of the same type and run the same firmware as the on devices that are of the same type and run the same firmware as the

3
doc/src/linux-mobile/creator-publish-maemo-extras-devel.qdoc
View File

@@ -61,7 +61,8 @@
\list 1 \list 1
\o Select the \gui {Maemo5} build target for your project. \o Select the \l{glossary-buildandrun-kit}{kit} with \gui {Maemo5} device type
for your project.
\o Choose \gui {Build > Publish Project}. \o Choose \gui {Build > Publish Project}.

27
doc/src/linux-mobile/linuxdev.qdoc
View File

@@ -31,17 +31,17 @@
If you have a tool chain for building applications for embedded Linux If you have a tool chain for building applications for embedded Linux
devices (with no MADDE support) installed on the development PC, you can add devices (with no MADDE support) installed on the development PC, you can add
it to \QC. You can then select the \gui {Embedded Linux} target to it to \QC. You can then select a \l{glossary-buildandrun-kit}{kit}
run applications on embedded Linux devices. with \gui {Embedded Linux} device type to
build and run applications on embedded Linux devices.
To be able to run and debug applications on embedded Linux devices, you must To be able to run and debug applications on embedded Linux devices, you must
create device configurations and select them in the \QC run create device configurations and select them in the \QC \l{glossary-buildandrun-kit}{kit}
settings.
You use a wizard to create the connections. You can edit the settings later You use a wizard to create the connections. You can edit the settings later
in \gui {Tools > Options > Linux Devices > Device Configurations}. in \gui {Tools > Options > Devices > Devices}.
\image qtcreator-linux-device-configurations.png "Device Configurations dialog" \image qtcreator-linux-device-configurations.png "Devices dialog"
You can protect the connections between \QC and a device by using You can protect the connections between \QC and a device by using
either a password or an SSH key. If you do not have an SSH key, you can either a password or an SSH key. If you do not have an SSH key, you can
@@ -67,8 +67,8 @@
\list 1 \list 1
\o Select \gui {Tools > Options > Linux Devices > Device \o Select \gui {Tools > Options > Linux Devices > Devices > Add
Configurations > Add > Generic Linux Device > Start Wizard}. > Generic Linux Device > Start Wizard}.
\image qtcreator-screenshot-devconf-linux.png "Connection Data wizard" \image qtcreator-screenshot-devconf-linux.png "Connection Data wizard"
@@ -91,9 +91,10 @@
\endlist \endlist
\o Select \gui Tools > \gui Options > \gui {Build & Run} > \gui Targets \o Select \gui Tools > \gui Options > \gui {Build & Run} > \gui Kits
> \gui Add to add a target for building for the device. Select the > \gui Add to add a kit for building for the device. Select the
Qt version, compiler, and device that you added above. Qt version, compiler, and device that you added above, and choose
\gui {Generic Linux Device} for the device type.
\o To specify build settings: \o To specify build settings:
@@ -102,9 +103,9 @@
\o Open a project for an application you want to develop for the \o Open a project for an application you want to develop for the
device. device.
\o Select \gui {Projects > Targets > Add}. \o Select \gui {Projects > Build & Run Settings > Add Kit}.
\o Select the target that you added above. \o Select the kit that you added above.
\endlist \endlist

8
doc/src/overview/creator-deployment-overview.qdoc
View File

@@ -40,7 +40,7 @@
\o \l{Deploying Applications to Linux-Based Devices} \o \l{Deploying Applications to Linux-Based Devices}
When you deploy the application on a Linux-based device target, such When you deploy the application on a Linux-based device, such
as \gui {Embedded Linux}, \gui Harmattan, or \gui{Maemo5}, \QC as \gui {Embedded Linux}, \gui Harmattan, or \gui{Maemo5}, \QC
copies the application files to the connected device. You copies the application files to the connected device. You
can test and debug the application on the device. can test and debug the application on the device.
@@ -48,14 +48,14 @@
Maemo 5 devices. Maemo 5 devices.
\o \l{Deploying Applications to QNX Devices} \o \l{Deploying Applications to QNX Devices}
When you deploy the application on the \gui{QNX} target, depending When you deploy the application on a \gui{QNX} device, depending
on your target device, \QC either generates a BAR package in the on your target device, \QC either generates a BAR package in the
build directory and deploys it to the connected device, or copies build directory and deploys it to the connected device, or copies
the application files to the connected device. You can test and the application files to the connected device. You can test and
debug the application on the device. debug the application on the device.
\o \l{Deploying Applications to Android Devices} \o \l{Deploying Applications to Android Devices}
When you deploy the application on the Android target, \QC copies When you deploy the application on an Android device, \QC copies
the application files to the device. In addition, you can determine the application files to the device. In addition, you can determine
the Qt libraries to use. the Qt libraries to use.
\endlist \endlist
@@ -68,7 +68,7 @@
When you are ready to publish the application on a publishing When you are ready to publish the application on a publishing
channel, you must make sure that the installation file meets the channel, you must make sure that the installation file meets the
requirements for publishing and installing applications to the requirements for publishing and installing applications to the
target devices. targeted devices.
\endlist \endlist
*/ */

2
doc/src/overview/creator-getting-started.qdoc
View File

@@ -49,7 +49,7 @@
with the parts of the user interface, go to \l{User Interface}. with the parts of the user interface, go to \l{User Interface}.
\o \bold {\l{Building and Running an Example}} \o \bold {\l{Building and Running an Example}}
To check that \l{glossary-development-target}{targets} were To check that \l{glossary-buildandrun-kit}{kits} for building and running were
successfully installed as part of the \QSDK installation, open successfully installed as part of the \QSDK installation, open
an example application and run it. If you have not done so an example application and run it. If you have not done so
before, go to \l{Building and Running an Example}. before, go to \l{Building and Running an Example}.

34
doc/src/overview/creator-glossary.qdoc
View File

@@ -43,7 +43,8 @@
into binaries. Different build configurations allow you to into binaries. Different build configurations allow you to
quickly build the project for different purposes. quickly build the project for different purposes.
By default, \QC creates \e {debug build} and \e {release build} By default, \QC creates \e {debug build} and \e {release build}
configurations for each \e target. A debug build contains configurations for each \l{glossary-buildandrun-kit}{kit} defined for your project.
A debug build contains
additional debug symbols that you need for debugging the additional debug symbols that you need for debugging the
application but that you can leave out from the release version. application but that you can leave out from the release version.
Generally, you use the debug configuration for testing and the Generally, you use the debug configuration for testing and the
@@ -79,6 +80,15 @@
copied to a location in the file system of the development PC or copied to a location in the file system of the development PC or
a mobile device. a mobile device.
\row
\o Kit
\target glossary-buildandrun-kit
\o \QC groups build and run specific settings as kits to make
cross-platform development easier. Each kit consists of a set
of values that define one environment, such as a device,
tool chain, Qt version, and debugger command to use. Configure kits at
\gui {Tools > Options > Build & Run > Kits}.
\row \row
\o Mode \o Mode
\target glossary-mode \target glossary-mode
@@ -102,14 +112,15 @@
\target glossary-project-qt \target glossary-project-qt
\o \QC allows you to have multiple versions of Qt installed on your \o \QC allows you to have multiple versions of Qt installed on your
development PC and use different versions to build your projects development PC and use different versions to build your projects
for different \e targets. for different purposes.
\row \row
\o Run configuration \o Run configuration
\target glossary-run-config \target glossary-run-config
\o Starts the application in the location where it was copied by \o Starts the application in the location where it was copied by
the \e {deploy configuration}. By default, when you run a the \e {deploy configuration}. By default, when you run a
project, \QC builds it, deploys it to the selected \e target, project, \QC builds it, deploys it to the device specified in the selected
\l{glossary-buildandrun-kit}{kit},
and runs it there. However, if you have not made any changes to and runs it there. However, if you have not made any changes to
the project since you last built and deployed it, \QC simply the project since you last built and deployed it, \QC simply
runs it again. runs it again.
@@ -126,23 +137,6 @@
if you need many build configurations for a single set of if you need many build configurations for a single set of
source files. source files.
\row
\o Target
\target glossary-development-target
\o \QC groups platform specific settings as 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 to use.
\row
\o Tool chain
\target glossary-tool-chain
\o Specifies a compiler and a debugger and other necessary
tools for building an application for a particular \e target.
\QC tries to detect the tool chains that are available on your
system. You can manually add tool chains that are not detected
automatically.
\endtable \endtable
*/ */

2
doc/src/overview/creator-issues.qdoc
View File

@@ -107,7 +107,7 @@
\if defined(qcmanual) \if defined(qcmanual)
\o On Windows, you must create projects for Maemo 5 and Harmattan \o On Windows, you must create projects for Maemo 5 and Harmattan
targets on the same partition where you installed \QSDK, \QC, and device types on the same partition where you installed \QSDK, \QC, and
MADDE. MADDE.
\endif \endif

3
doc/src/overview/creator-mobile-targets.qdoc
View File

@@ -32,7 +32,8 @@
\title Connecting Mobile Targets \title Connecting Mobile Targets
You can connect mobile devices to the development PC to build, run, debug, You can connect mobile devices to the development PC to build, run, debug,
and analyze applications on them from \QC. When you install mobile targets and analyze applications on them from \QC. When you install
\l{glossary-buildandrun-kit}{kits} for building and running on mobile targets
as part of the \QSDK, the build and run settings for the target devices are as part of the \QSDK, the build and run settings for the target devices are
set up automatically in \QC. However, \QSDK does not contain a tool chain set up automatically in \QC. However, \QSDK does not contain a tool chain
for building applications for embedded Linux devices. for building applications for embedded Linux devices.

5
doc/src/overview/creator-overview.qdoc
View File

@@ -87,9 +87,10 @@
and commands used to build the project. and commands used to build the project.
\QC provides support for building, running, and deploying Qt \QC provides support for building, running, and deploying Qt
applications for desktop environment and mobile devices. Build, applications for desktop environment and mobile devices.
\l{glossary-buildandrun-kit}{Kits}, build,
run, and deployment settings allow you to quickly switch between run, and deployment settings allow you to quickly switch between
targets. different setups and targets.
For more information, see \l{Building and Running}. For more information, see \l{Building and Running}.
\o \bold {\l{Debugging and Analyzing}} \o \bold {\l{Debugging and Analyzing}}

8
doc/src/projects/creator-projects-build-run-tutorial.qdoc
View File

@@ -50,22 +50,22 @@
\o Select \gui Projects to configure the project: \o Select \gui Projects to configure the project:
\image qtcreator-gs-build-example-targets.png "Selecting targets" \image qtcreator-gs-build-example-targets.png "Selecting kit for building and running"
\list 1 \list 1
\o Select at least \QS and one of the mobile \o Select at least \QS and one of the mobile
\l{glossary-development-target}{targets} (1), Maemo 5 or \l{glossary-buildandrun-kit}{kits} (1), Maemo 5 or
MeeGo Harmattan, depending on the device you develop for. MeeGo Harmattan, depending on the device you develop for.
\o Select \gui {Configure Project} (2). \o Select \gui {Configure Project} (2).
\endlist \endlist
\o To test the application in \QS, click the \gui {Target \o To test the application in \QS, click the \gui {Kit
Selector} and select \gui {\QS}. Selector} and select \gui {\QS}.
\image qtcreator-gs-build-example-select-qs.png "Selecting Qt Simulator as target" \image qtcreator-gs-build-example-select-qs.png "Selecting Qt Simulator as target device type"
\o Click \o Click
\inlineimage qtcreator-run.png \inlineimage qtcreator-run.png

20
doc/src/projects/creator-projects-building-running.qdoc
View File

@@ -34,20 +34,24 @@
\image creator_buildingrunning.png \image creator_buildingrunning.png
\QC provides support for building, running, and deploying Qt applications \QC provides support for building, running, and deploying Qt applications
for different \l{glossary-development-target}{targets}. for different targets, or using different compilers, debuggers or Qt versions.
\l{glossary-buildandrun-kit}{Kits} define the tools,
device type and other settings to use when building and running your project.
\list \list
\o \l{Building for Multiple Targets} \o \l{Building for Multiple Targets}
\e {Build configurations} contain everything you need to compile \e {Build configurations} contain everything you need to compile
the sources into binaries. the sources into binaries. Build configurations use the tools and settings
defined in their corresponding \l{glossary-buildandrun-kit}{kit}.
\o \l{Running on Multiple Targets} \o \l{Running on Multiple Targets}
\e {Run configurations} start the application in the location \e {Run configurations} start the application in the location
where it was copied by the \e{deploy configuration}. By default, where it was copied by the \e{deploy configuration}. By default,
when you select the \gui Run function, \QC builds the project, when you select the \gui Run function, \QC builds the project,
deploys it to the selected target, and runs it there. However, deploys it to the target defined in the \l{glossary-buildandrun-kit}{kit},
and runs it there. However,
if you have not made any changes to the project since you last if you have not made any changes to the project since you last
built and deployed it, \QC simply runs it again. built and deployed it, \QC simply runs it again.
@@ -60,8 +64,8 @@
\o \l{Connecting Mobile Targets} \o \l{Connecting Mobile Targets}
When you install tool chains for build targets as part of the \QSDK, When you install tool chains for device types as part of the \QSDK,
the build and run settings for mobile device targets are set up the build and run settings for mobile device types are set up
automatically. However, you might need to install and configure some automatically. However, you might need to install and configure some
additional software on the devices to be able to connect to them additional software on the devices to be able to connect to them
from the development PC. from the development PC.
@@ -75,7 +79,7 @@
\o \l{Customizing the Build Process} \o \l{Customizing the Build Process}
By default, running an application also builds it and deploys it to By default, running an application also builds it and deploys it to
a location from where it can be run on the target. You can change a location from where it can be run on the target device. You can change
the relationship between the build, run, and deploy configurations. the relationship between the build, run, and deploy configurations.
\o \l{http://doc.qt.nokia.com/qtsimulator/index.html} \o \l{http://doc.qt.nokia.com/qtsimulator/index.html}
@@ -89,7 +93,9 @@
Therefore, applications that run well on \QS also run on Therefore, applications that run well on \QS also run on
any device that hosts the Qt and Qt Mobility libraries. any device that hosts the Qt and Qt Mobility libraries.
The \QS is installed as part of the \QSDK. After it is The \QS is installed as part of the \QSDK. After it is
installed, you can select it as a build target in \QC. installed, you can create a \l{glossary-buildandrun-kit}{kit}
with \gui Desktop device type and the Qt Simulator Qt version for
building and running your projects.
\o \l{Using Maemo or MeeGo Harmattan Emulator} \o \l{Using Maemo or MeeGo Harmattan Emulator}

15
doc/src/projects/creator-projects-building.qdoc
View File

@@ -31,12 +31,15 @@
\title Building for Multiple Targets \title Building for Multiple Targets
You can build applications for multiple \l{glossary-development-target} You can build applications for multiple targets, or using different compilers,
{targets}. By default, when you run the application on a target, you debuggers or Qt versions. \l{glossary-buildandrun-kit}{Kits} define the tools,
automatically build it for the target and deploy it to the target first. device type and other settings to use.
By default, when you run the application, you
automatically build and deploy it first.
However, you can also perform each operation separately. However, you can also perform each operation separately.
To check that the application code can be compiled and linked for a target, To check that the application code can be compiled and linked for a device,
you can build the project. The build errors and warnings are displayed in you can build the project. The build errors and warnings are displayed in
the \gui {Issues} output pane. More detailed information is displayed the \gui {Issues} output pane. More detailed information is displayed
in the \gui {Compile Output} pane. in the \gui {Compile Output} pane.
@@ -45,9 +48,9 @@
\list 1 \list 1
\o Select a target for the project. \o Select a \l{glossary-buildandrun-kit}{kit} for the project.
\image qtcreator-target-selector.png "Target selector" \image qtcreator-kit-selector.png "Kit selector"
\o Choose \gui {Build > Build Project} or press \key {Ctrl+B}. \o Choose \gui {Build > Build Project} or press \key {Ctrl+B}.

10
doc/src/projects/creator-projects-compilers.qdoc
View File

@@ -33,9 +33,9 @@
Qt is supported on a variety of 32-bit and 64-bit platforms, and can Qt is supported on a variety of 32-bit and 64-bit platforms, and can
usually be built on each platform with GCC, a vendor-supplied compiler, or usually be built on each platform with GCC, a vendor-supplied compiler, or
a third party compiler. In \QC, a \l{glossary-development-target}{target} a third party compiler. In \QC, a \l{glossary-buildandrun-kit}{kit}
specifies the compiler and other necessary tools for building an specifies the compiler and other necessary tools for building and running an
application for a particular platform. application on a particular platform.
\QC automatically detects the compilers that are registered by your system \QC automatically detects the compilers that are registered by your system
or by an SDK. You can add compilers to build applications by using other or by an SDK. You can add compilers to build applications by using other
@@ -64,8 +64,8 @@
the application binary interface (ABI) version from the list of available the application binary interface (ABI) version from the list of available
versions. You can also create a custom ABI definition. versions. You can also create a custom ABI definition.
You specify the compiler to use for each target in \gui Tools > You specify the compiler to use for each kit in \gui Tools >
\gui Options > \gui {Build & Run} > \gui Targets. \gui Options > \gui {Build & Run} > \gui Kits.
To add compilers: To add compilers:

16
doc/src/projects/creator-projects-creating.qdoc
View File

@@ -68,9 +68,9 @@
use \QC as a code editor and to fully control the steps and commands used to use \QC as a code editor and to fully control the steps and commands used to
build the project. build the project.
You can install mobile device \l{glossary-development-target}{targets} You can install tools for mobile devices
as part of the \QSDK. The build and run settings for the as part of the \QSDK. The \l{glossary-buildandrun-kit}{kits} and build and run settings for the
installed targets are set up automatically. However, you might need to installed device types are set up automatically. However, you might need to
install and configure some additional software on the devices to be able to install and configure some additional software on the devices to be able to
connect to them from the development PC. connect to them from the development PC.
@@ -78,7 +78,7 @@
In the first step, you In the first step, you
select a template for the project. You can filter templates (1) to view only select a template for the project. You can filter templates (1) to view only
those that apply to a particular target. those that apply to a particular device type.
\image qtcreator-new-qt-quick-project-wizard.png \image qtcreator-new-qt-quick-project-wizard.png
@@ -225,8 +225,8 @@
To create a new project, select \gui File > \gui{New File or Project} and To create a new project, select \gui File > \gui{New File or Project} and
select the type of your project. The contents of the wizard dialogs depend select the type of your project. The contents of the wizard dialogs depend
on the project type and the build targets that you select in the on the project type and the \l{glossary-buildandrun-kit}{kits} that you select in the
\gui {Target Setup} dialog. Follow the instructions of the wizard. \gui {Kit Selection} dialog. Follow the instructions of the wizard.
For examples of creating different types of projects, see For examples of creating different types of projects, see
\l{Tutorials}. \l{Tutorials}.
@@ -238,8 +238,8 @@
for building and running projects, select \gui{Tools} > \gui{Options} > for building and running projects, select \gui{Tools} > \gui{Options} >
\gui{Build & Run} > \gui{General}. \gui{Build & Run} > \gui{General}.
To specify build and run settings for different target platforms, select To specify build and run settings for different target platforms ,
\gui Projects. select \gui Projects.
\section1 Adding Files to Projects \section1 Adding Files to Projects

15
doc/src/projects/creator-projects-opening.qdoc
View File

@@ -39,19 +39,20 @@
one environment to another. Therefore, we recommend that you click \gui No one environment to another. Therefore, we recommend that you click \gui No
and enter the information again in the \gui {Configure Project} tab. and enter the information again in the \gui {Configure Project} tab.
The \gui {Configure Project} tab displays a list of development environments The \gui {Configure Project} tab displays a list of \l{glossary-buildandrun-kit}{kits}
for target platforms that are installed on the development PC and for building and running projects, that are installed on the development PC and
configured in \gui Tools > \gui Options > \gui {Build & Run} > \gui Targets. configured in \gui Tools > \gui Options > \gui {Build & Run} > \gui Kits.
Select the targets that you want to build the project for. Select the kits that you want to build and run the project with.
\image qtcreator-open-project-targets.png "Configure Project tab" \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 Even if you do not intend to build the project, the C++ and QML code models
need a Qt version and compiler 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 select the \gui Options link, or select \gui {Tools > Options > Build & Run
> Targets}. > Kits}.
If \QC cannot find an existing build for a particular target, it starts out If \QC cannot find an existing build for a particular \l{glossary-buildandrun-kit}{kit},
it starts out
from a clean slate, and creates new debug and release build configurations from a clean slate, and creates new debug and release build configurations
in the specified directory. \QC suggests a name in the specified directory. \QC suggests a name
and location for the directory that you can change. and location for the directory that you can change.
@@ -71,7 +72,7 @@
\o Select \gui File > \gui{Open File or Project} and select the project \o Select \gui File > \gui{Open File or Project} and select the project
to open. to open.
\o In the \gui {Configure Project} tab, select build targets for your \o In the \gui {Configure Project} tab, select kits for building and running your
project, and click \gui {Configure Project}. project, and click \gui {Configure Project}.
\endlist \endlist

7
doc/src/projects/creator-projects-qt-versions.qdoc
View File

@@ -32,7 +32,7 @@
\title Adding Qt Versions \title Adding Qt Versions
\QC allows you to have multiple versions of Qt installed on your development \QC allows you to have multiple versions of Qt installed on your development
PC and use different versions to build your projects for different targets. PC and use different versions to build your projects.
For example, \QSDK contains special Qt versions for developing applications For example, \QSDK contains special Qt versions for developing applications
for mobile devices. for mobile devices.
@@ -42,8 +42,9 @@
\gui {Qt version for} section. To add Qt versions, select \gui {Qt version for} section. To add Qt versions, select
\gui {Tools > Options > Build & Run > Qt Versions}. \gui {Tools > Options > Build & Run > Qt Versions}.
You specify the Qt version to use for each \l{glossary-development-target} You specify the Qt version to use for each \l{glossary-buildandrun-kit}
{target} in \gui Tools > \gui Options > \gui {Build & Run} > \gui Targets. {kit} for building and running your projects
in \gui Tools > \gui Options > \gui {Build & Run} > \gui Kits.
\section2 Setting Up New Qt Versions \section2 Setting Up New Qt Versions

4
doc/src/projects/creator-projects-running-desktop.qdocinc
View File

@@ -2,9 +2,9 @@
\list 1 \list 1
\o Select \gui Desktop as the target. \o Select \gui Desktop as the build and run \l{glossary-buildandrun-kit}{kit}.
\image qtcreator-target-selector.png "Target selector" \image qtcreator-kit-selector.png "Kit selector"
\o Click the \gui Run button. \o Click the \gui Run button.

2
doc/src/projects/creator-projects-running-simulator.qdocinc
View File

@@ -7,7 +7,7 @@
\list 1 \list 1
\o Select \gui {\QS} as the target. \o Select \gui {\QS} as the build and run \l{glossary-buildandrun-kit}{kit}.
\o Click the \gui Run button. \o Click the \gui Run button.

9
doc/src/projects/creator-projects-settings-build.qdoc
View File

@@ -55,11 +55,12 @@
By default, \QC builds projects in a separate directory from the source By default, \QC builds projects in a separate directory from the source
directory, as \l{glossary-shadow-build} {shadow builds}. This keeps the directory, as \l{glossary-shadow-build} {shadow builds}. This keeps the
files generated for each \l{glossary-development-target}{target} separate. files generated for each \l{glossary-buildandrun-kit}{build and run kit} separate.
If you only build for one target, you can deselect the \gui {Shadow build} If you only build and run with a single \l{glossary-buildandrun-kit}{kit},
you can deselect the \gui {Shadow build}
checkbox. checkbox.
Shadow building is not supported for the following target platforms on Shadow building is not supported for the following device types on
Windows: Windows:
\list \list
@@ -192,7 +193,7 @@
\list \list
\o \l{Adding Targets} \o \l{Adding Kits}
\o \l{Adding Qt Versions} \o \l{Adding Qt Versions}
\o \l{Adding Compilers} \o \l{Adding Compilers}

19
doc/src/projects/creator-projects-settings-overview.qdoc
View File

@@ -33,8 +33,7 @@
\omit \omit
When you install the \QSDK, the build and run settings for the development When you install the \QSDK, the build and run settings for the development
targets targets delivered with the \QSDK are set up automatically.
delivered with the \QSDK are set up automatically.
\endomit \endomit
To view and modify the settings for currently open projects, switch to the To view and modify the settings for currently open projects, switch to the
@@ -42,23 +41,23 @@
\image qtcreator-project-targets.png \image qtcreator-project-targets.png
To add build and run targets for the project, select \gui Add. The list To add build and run \l{glossary-buildandrun-kit}{kits} for the project, select \gui Add. The list
displays targets that are configured in \gui Tools > \gui Options > displays kits that are configured in \gui Tools > \gui Options >
\gui {Build & Run} > \gui Targets. To add targets to the list, select \gui {Build & Run} > \gui Kits. To add kits to the list, select
\gui Manage. \gui Manage.
To remove a target, hover the cursor over it (1) and click To remove a kit, hover the cursor over it (1) and click
\inlineimage qtcreator-target-remove.png "Remove Target button" \inlineimage qtcreator-target-remove.png "Remove Kit button"
. .
You can select the targets and use the \gui Build menu commands to build, You can select the kits and use the \gui Build menu commands to build,
deploy, and run projects. deploy, and run projects.
The project pane consists of the following tabs: The project pane consists of the following tabs:
\list \list
\o \l{Adding Targets}{Targets} \o \l{Adding Kits}{Build & Run}
\list \list
@@ -69,7 +68,7 @@
\endlist \endlist
\note If you have not configured the project for building, the \note If you have not configured the project for building, the
\gui Targets tab is replaced by the \l{Opening Projects} \gui {Build & Run} tab is replaced by the \l{Opening Projects}
{Configure Projects} tab. {Configure Projects} tab.
\o \l{Specifying Editor Settings}{Editor Settings} \o \l{Specifying Editor Settings}{Editor Settings}

3
doc/src/projects/creator-projects-settings-run-analyze.qdocinc
View File

@@ -4,8 +4,7 @@
detecting memory leaks and profiling function execution. You can configure detecting memory leaks and profiling function execution. You can configure
the tools according to your needs. the tools according to your needs.
You can specify analyzer settings for the desktop and \QS targets. You can specify analyzer settings either globally for all projects or separately for each
You can specify them either globally for all projects or separately for each
project. project.
To specify analyzer settings for the current project: To specify analyzer settings for the current project:

2
doc/src/projects/creator-projects-settings-run-desktop.qdocinc
View File

@@ -1,4 +1,4 @@
\section2 Specifying Run Settings for Desktop Targets \section2 Specifying Run Settings for Desktop Device Types
You can specify command line arguments to be passed to the executable You can specify command line arguments to be passed to the executable
and the working directory to use. The working directory defaults to and the working directory to use. The working directory defaults to

6
doc/src/projects/creator-projects-settings-run.qdoc
View File

@@ -32,10 +32,10 @@
\title Specifying Run Settings \title Specifying Run Settings
\QC automatically creates run configurations for your project. \QC automatically creates run configurations for your project.
To view and modify the settings, select \gui {Projects > Run}. To view and modify the settings, select \gui {Projects > Build & Run > Run}.
The settings to specify depend on the type of the project and on the build The settings to specify depend on the type of the project and on the
target for the project. \l{glossary-buildandrun-kit}{kit} that you build and run the project with.
Click \gui Add to add run settings for a project and \gui Remove to remove Click \gui Add to add run settings for a project and \gui Remove to remove
the current settings. the current settings.

25
doc/src/projects/creator-projects-targets.qdoc
View File

@@ -29,13 +29,14 @@
\page creator-targets.html \page creator-targets.html
\nextpage creator-project-qmake.html \nextpage creator-project-qmake.html
\title Adding Targets \title Adding Kits
\QC groups platform specific settings as \e targets to make cross-platform \QC groups settings used for building and running projects as kits
development easier. Each target consists of a set of values that define one to make cross-platform and cross-configuration
development easier. Each kit consists of a set of values that define one
environment, such as a device, compiler, 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 to use, and some metadata, such as an icon and a name for the kit. Once
you have defined targets, you can select them to build and run projects. you have defined kits, you can select them to build and run projects.
\QC supports development for the desktop and for the following types of \QC supports development for the desktop and for the following types of
devices: devices:
@@ -54,18 +55,18 @@
\endlist \endlist
To add targets: To add kits:
\list 1 \list 1
\o Select \gui Tools > \gui Options > \gui {Build & Run} > \gui Targets \o Select \gui Tools > \gui Options > \gui {Build & Run} > \gui Kits
> \gui Add. > \gui Add.
\image qtcreator-targets.png \image qtcreator-targets.png
To clone the selected target, select \gui Clone. To clone the selected kit, select \gui Clone.
\o In the \gui Name column, double-click the target name to change it. \o In the \gui Name column, double-click the kit name to change it.
@@ -73,11 +74,11 @@
target. target.
Double-click the icon next to the field to select the image that is Double-click the icon next to the field to select the image that is
displayed in the target selector for this target. You can use any displayed in the kit selector for this kit. You can use any
image in a supported file format (for example, PNG). The image is image in a supported file format (for example, PNG). The image is
scaled to the size 64x64 pixels. For example, using the compiler scaled to the size 64x64 pixels. For example, using the compiler
logo as an icon allows you to easily see, which compiler is used to logo as an icon allows you to easily see, which compiler is used to
build the project for the selected target. build the project for the selected kit.
\o In the \gui Device field, select the device configuration to target. \o In the \gui Device field, select the device configuration to target.
@@ -104,7 +105,7 @@
\QC checks the directories listed in the \c{PATH} environment \QC checks the directories listed in the \c{PATH} environment
variable for the qmake executable. If a qmake executable is found, variable for the qmake executable. If a qmake executable is found,
it is referred to as \bold{Qt in PATH} and selected as the Qt it is referred to as \bold{Qt in PATH} and selected as the Qt
version to use for the \gui Desktop target. version to use for the \gui Desktop kit that is created by default.
\o In the \gui {Qt mkspec} field, specify build instructions for qmake. \o In the \gui {Qt mkspec} field, specify build instructions for qmake.
If you leave this field empty, the default value is used. If you leave this field empty, the default value is used.

2
doc/src/qtcreator.qdoc
View File

@@ -169,7 +169,7 @@
\list \list
\o \l{Specifying Build Settings} \o \l{Specifying Build Settings}
\list \list
\o \l{Adding Targets} \o \l{Adding Kits}
\o \l{Adding Qt Versions} \o \l{Adding Qt Versions}
\o \l{Adding Compilers} \o \l{Adding Compilers}
\endlist \endlist

2
doc/src/qtquick/creator-projects-settings-run-qtquick.qdocinc
View File

@@ -1,6 +1,6 @@
\section1 Specifying Run Settings for Qt Quick UI Projects \section1 Specifying Run Settings for Qt Quick UI Projects
You can specify run settings for the \gui Desktop target: You can specify run settings for \l{glossary-buildandrun-kit}{kits} with \gui Desktop device type:
\list \list

10
doc/src/qtquick/qtquick-app-tutorial.qdoc
View File

@@ -59,13 +59,11 @@
\o In the \gui {Create in} field, enter the path for the project files. \o In the \gui {Create in} field, enter the path for the project files.
For example, \c {C:\Qt\examples}, and then click \gui{Next}. For example, \c {C:\Qt\examples}, and then click \gui{Next}.
\o In the \gui {Application Type} dialog, select \gui {Built-in \o Select \l{glossary-buildandrun-kit}{kits} for running and building your project,
elements only (for all platforms)}, and then click \gui{Next}. and then click \gui{Next}.
\o Select targets, and then click \gui{Next}. \note Kits are listed if they have been specified in \gui Tools >
\gui Options > \gui {Build & Run} > \gui Kits.
\note Targets are listed if they have been specified in \gui Tools >
\gui Options > \gui {Build & Run} > \gui Targets.
\o Select \gui Next in the following dialogs to use the default \o Select \gui Next in the following dialogs to use the default
settings. settings.

14
doc/src/qtquick/qtquick-creating.qdoc
View File

@@ -154,15 +154,15 @@
\o Click \gui{Next}. \o Click \gui{Next}.
The \gui {Target Setup} dialog opens. The \gui {Kit Selection} dialog opens.
\image qmldesigner-new-project-qt-versions.png "Target Setup dialog" \image qmldesigner-new-project-qt-versions.png "Kit Selection dialog"
\o Select build targets for your project, \o Select build and run \l{glossary-buildandrun-kit}{kits} for your project,
and then click \gui{Next}. and then click \gui{Next}.
\note If only one target is specified in \gui Tools > \gui Options > \note If only one kit is specified in \gui Tools > \gui Options >
\gui {Build & Run} > \gui Targets, this dialog is skipped. \gui {Build & Run} > \gui Kits, this dialog is skipped.
The \gui {Mobile Options} dialog opens. The \gui {Mobile Options} dialog opens.
@@ -172,8 +172,8 @@
application behaves when the orientation of the device display application behaves when the orientation of the device display
rotates between portrait and landscape, and then click \gui Next. rotates between portrait and landscape, and then click \gui Next.
\note This dialog opens only if you select \gui Maemo5 \note This dialog opens only if you select a \l{glossary-buildandrun-kit}{kit}
target in the \gui {Target Setup} dialog. On with \gui Maemo5 device type in the \gui {Kit Selection} dialog. On
Harmattan, the Qt Quick Components for MeeGo provide native-looking Harmattan, the Qt Quick Components for MeeGo provide native-looking
rotation. rotation.

10
doc/src/widgets/qtdesigner-app-tutorial.qdoc
View File

@@ -57,15 +57,15 @@
\o In the \gui {Create in} field, enter the path for the project files. \o In the \gui {Create in} field, enter the path for the project files.
For example, \c {C:\Qt\examples}, and then click \gui{Next}. For example, \c {C:\Qt\examples}, and then click \gui{Next}.
The \gui {Target Setup} dialog opens. The \gui {Kit Selection} dialog opens.
\image qtcreator-new-project-qt-versions-qt-gui.png "Target Setup dialog" \image qtcreator-new-project-qt-versions-qt-gui.png "Kit Selection dialog"
\o Select build targets for your project, \o Select build and run \l{glossary-buildandrun-kit}{kits} for your project,
and click \gui{Next}. and click \gui{Next}.
\note If only one target is specified in \gui Tools > \gui Options > \note If only one kit is specified in \gui Tools > \gui Options >
\gui {Build & Run} > \gui Targets, this dialog is \gui {Build & Run} > \gui Kits, this dialog is
skipped. skipped.
The \gui{Class Information} dialog opens. The \gui{Class Information} dialog opens.

2
src/plugins/analyzerbase/ianalyzertool.cpp
View File

@@ -66,7 +66,7 @@ QString IAnalyzerTool::defaultActionName(const IAnalyzerTool *tool, StartMode mo
{ {
QString base = tool->displayName(); QString base = tool->displayName();
if (mode == StartRemote) if (mode == StartRemote)
return base + tr(" (Remote)"); return base + tr(" (External)");
return base; return base;
} }