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

Doc: replace "targets" with "devices" or "target platforms"

Browse Source 
Try to make the terminology more consistent, where possible.

Change-Id: Ic3f86fcffe845f9a118bb2ee630e706e832e8e05
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
Leena Miettinen
2012-09-14 12:44:57 +02:00
committed by Eike Ziller
parent 77288af63e
commit 1f8c835310
19 changed files with 54 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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 corresponding kit for the device} \l{Running on Multiple Platforms}{select the corresponding kit for the device}
before you start debugging. before you start debugging.
\endlist \endlist

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

@@ -36,7 +36,7 @@
build and run applications on embedded Linux devices. 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 \l{glossary-buildandrun-kit}{kit} add devices and select them in the \QC \l{glossary-buildandrun-kit}{kit}.
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 > \gui Options > \gui Devices. in \gui Tools > \gui Options > \gui Devices.

4
doc/src/linux-mobile/maemodev.qdoc
View File

@@ -224,7 +224,7 @@
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 > \gui Options > \gui Devices. in \gui Tools > \gui Options > \gui Devices.
\image qtcreator-maemo-device-configurations.png "Maemo Device Configurations dialog" \image qtcreator-maemo-device-configurations.png "Devices dialog"
By default, you create the connection as the \e developer user. This By default, you create the connection as the \e developer user. This
protects real user data on the device from getting corrupted during protects real user data on the device from getting corrupted during
@@ -286,7 +286,7 @@
\o Select \gui {Maemo5/Fremantle} > \gui {Start Wizard}. \o Select \gui {Maemo5/Fremantle} > \gui {Start Wizard}.
\image qtcreator-dev-conf-maemo.png "Maemo device configuration" \image qtcreator-dev-conf-maemo.png "Maemo device"
\o In the \gui {The name to identify this configuration} field, \o In the \gui {The name to identify this configuration} field,
enter a name for the connection. enter a name for the connection.

2
doc/src/linux-mobile/meegodev.qdoc
View File

@@ -237,7 +237,7 @@
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 > \gui Options > \gui Devices. in \gui Tools > \gui Options > \gui Devices.
\image qtcreator-meego-device-configurations.png "MeeGo Device Configurations dialog" \image qtcreator-meego-device-configurations.png "Devices dialog"
By default, you create the connection as the \e developer user. This By default, you create the connection as the \e developer user. This
protects real user data on the device from getting corrupted during testing. protects real user data on the device from getting corrupted during testing.

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

@@ -53,9 +53,9 @@
Maemo 5/Fremantle devices. Maemo 5/Fremantle devices.
\o \l{Deploying Applications to QNX Devices} \o \l{Deploying Applications to QNX Devices}
When you deploy the application on a QNX device, depending When you deploy the application on a BlackBerry, \QC generates a
on your target device, \QC either generates a BAR package in the BAR package in the build directory and deploys it to the connected
build directory and deploys it to the connected device, or copies device. When you deploy it on a QNX Neutrino device, \QC 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.
\endlist \endlist
@@ -67,8 +67,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 on the channel.
targeted devices.
\endlist \endlist
*/ */

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

@@ -103,7 +103,8 @@
\o Project \o Project
\target glossary-project \target glossary-project
\o Groups together a set of source files, forms, and resource files \o Groups together a set of source files, forms, and resource files
that you can build, deploy, and run for different \e targets, as that you can build, deploy, and run for different desktop and
mobile device platforms, as
specified by a \e {build configuration}, \e {deploy specified by a \e {build configuration}, \e {deploy
configuration}, and \e {run configuration}. configuration}, and \e {run configuration}.

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

@@ -29,14 +29,13 @@
\page creator-connecting-mobile.html \page creator-connecting-mobile.html
\nextpage creator-developing-android.html \nextpage creator-developing-android.html
\title Connecting Mobile Targets \title Connecting Mobile Devices
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 and analyze applications on them from \QC. When you install an SDK for a
\l{glossary-buildandrun-kit}{kits} for building and running on mobile targets target platform, such as Android or QNX, the build and run settings for the
as part of the \QSDK, the build and run settings for the target devices are development targets delivered with the SDK might be set up automatically in
set up automatically in \QC. However, \QSDK does not contain a tool chain \QC.
for building applications for embedded Linux devices.
You can connect the device to the development PC using a USB connection. You can connect the device to the development PC using a USB connection.
Additionally, you can connect Linux-based devices by using a WLAN Additionally, you can connect Linux-based devices by using a WLAN
@@ -57,8 +56,7 @@
If you have a tool chain for building applications for embedded If you have a tool chain for building applications for embedded
Linux devices (with no MADDE support) installed on the development Linux devices (with no MADDE support) installed on the development
PC, you can add it to \QC. Create device configurations and select PC, you can add it and the device to \QC.
them in the \QC run settings.
\o \l{Connecting Maemo Devices} \o \l{Connecting Maemo Devices}

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

@@ -90,7 +90,7 @@
applications for desktop environment and mobile devices. applications for desktop environment and mobile devices.
\l{glossary-buildandrun-kit}{Kits}, build, \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
different setups and targets. different setups and target platforms.
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}}

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

@@ -65,7 +65,7 @@
\o To test the application in \QS, click the \gui {Kit \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 device type" \image qtcreator-gs-build-example-select-qs.png "Selecting Qt Simulator to run on"
\o Click \o Click
\inlineimage qtcreator-run.png \inlineimage qtcreator-run.png
@@ -82,7 +82,7 @@
\o Change the settings in the \gui Model view. For example, rotate the \o Change the settings in the \gui Model view. For example, rotate the
device by clicking the \gui {Orientation} buttons or choose from the device by clicking the \gui {Orientation} buttons or choose from the
various mobile device configurations in the \gui {Device} field. You various mobile devices in the \gui {Device} field. You
can also simulate various mobile functions and create your own can also simulate various mobile functions and create your own
scripts. scripts.

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

@@ -34,23 +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 targets, or using different compilers, debuggers or Qt versions. for different target platforms, or using different compilers, debuggers, or
Qt versions.
\l{glossary-buildandrun-kit}{Kits} define the tools, \l{glossary-buildandrun-kit}{Kits} define the tools,
device type and other settings to use when building and running your project. 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 Platforms}
\e {Build configurations} contain everything you need to compile \e {Build configurations} contain everything you need to compile
the sources into binaries. Build configurations use the tools and settings the sources into binaries. Build configurations use the tools and settings
defined in their corresponding \l{glossary-buildandrun-kit}{kit}. defined in their corresponding \l{glossary-buildandrun-kit}{kit}.
\o \l{Running on Multiple Targets} \o \l{Running on Multiple Platforms}
\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 target defined in the \l{glossary-buildandrun-kit}{kit}, deploys it to the device defined in the \l{glossary-buildandrun-kit}{kit},
and runs it there. However, 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.
@@ -62,10 +63,10 @@
at. The files can be copied to a location in the file system of at. The files can be copied to a location in the file system of
the development PC or a mobile device. the development PC or a mobile device.
\o \l{Connecting Mobile Targets} \o \l{Connecting Mobile Devices}
When you install tool chains for device types as part of the \QSDK, When you install tool chains for device types as part of an SDK,
the build and run settings for mobile device types are set up the build and run settings for mobile device types might be 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.
@@ -79,7 +80,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 device. You can change a location from where it can be run on the 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}

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

@@ -29,9 +29,10 @@
\page creator-building-targets.html \page creator-building-targets.html
\nextpage creator-running-targets.html \nextpage creator-running-targets.html
\title Building for Multiple Targets \title Building for Multiple Platforms
You can build applications for multiple targets, or using different compilers, You can build applications for multiple target platforms, or using different
compilers,
debuggers or Qt versions. \l{glossary-buildandrun-kit}{Kits} define the tools, debuggers or Qt versions. \l{glossary-buildandrun-kit}{Kits} define the tools,
device type and other settings to use. device type and other settings to use.

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

@@ -238,7 +238,7 @@
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 , To specify build and run settings for different target platforms,
select \gui Projects. select \gui Projects.
\section1 Adding Files to Projects \section1 Adding Files to Projects

2
doc/src/projects/creator-projects-running.qdoc
View File

@@ -29,7 +29,7 @@
\page creator-running-targets.html \page creator-running-targets.html
\nextpage creator-deployment.html \nextpage creator-deployment.html
\title Running on Multiple Targets \title Running on Multiple Platforms
By default, running an application also builds it and deploys it to a By default, running an application also builds it and deploys it to a
location from where it can be run on the desktop, in \QS, or location from where it can be run on the desktop, in \QS, or

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

@@ -31,10 +31,9 @@
\title Configuring Projects \title Configuring Projects
\omit When you install an SDK for a target platform, such as Android or QNX, the
When you install the \QSDK, the build and run settings for the development build and run settings for the development
targets delivered with the \QSDK are set up automatically. targets delivered with the SDK might be set up automatically in \QC.
\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
\gui Projects mode by pressing \key Ctrl+5. \gui Projects mode by pressing \key Ctrl+5.

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

@@ -68,10 +68,7 @@
\o In the \gui Name column, double-click the kit name to change it. \o In the \gui Name column, double-click the kit name to change it.
\o In the \gui{Device type} field, select the type of the device.
\o In the \gui{Device type} field, select the type of the device to
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 kit selector for this kit. You can use any displayed in the kit selector for this kit. You can use any
@@ -80,7 +77,7 @@
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 kit. 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 a device.
\o In the \gui Sysroot field, specify the directory where the device \o In the \gui Sysroot field, specify the directory where the device
image is located. If you are not cross-compiling, leave this field image is located. If you are not cross-compiling, leave this field

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

@@ -32,13 +32,11 @@
\title Deploying Applications to QNX Devices \title Deploying Applications to QNX Devices
When you deploy the application on the \gui{QNX} target, depending on your You can deploy applications to BlackBerry and QNX Neutrino devices.
target device, \QC either generates a BAR package and installs it on the
connected device, or copies the application files to the device.
\section1 Deploying to BlackBerry Devices \section1 Deploying to BlackBerry Devices
For \gui{BlackBerry} targets, \QC generates a BAR package in the build For BlackBerry devices, \QC generates a BAR package in the build
directory and installs it on the connected device. The contents of the BAR directory and installs it on the connected device. The contents of the BAR
package are specified in the \gui{Application Descriptor File}. package are specified in the \gui{Application Descriptor File}.
@@ -64,7 +62,7 @@
\section1 Deploying to QNX Neutrino Devices \section1 Deploying to QNX Neutrino Devices
Deploying applications to a \gui{QNX Neutrino} device is very similar to Deploying applications to a QNX Neutrino device is very similar to
\l{Deploying Applications to Linux-Based Devices}. \l{Deploying Applications to Linux-Based Devices}.
\image qtcreator-qnx-deployment.png "Deploy to device" \image qtcreator-qnx-deployment.png "Deploy to device"

11
doc/src/qnx/creator-developing-qnx.qdoc
View File

@@ -80,9 +80,8 @@
\section1 Adding a BlackBerry Device in \QC \section1 Adding a BlackBerry Device in \QC
Adding a BlackBerry device is done using a wizard in the \gui{Device Adding a BlackBerry device is done using a wizard in the \gui{Device
Configurations} options. To launch it, go to \gui{Tools > Options > Configurations} options. To launch it, go to \gui Tools > \gui Options >
Linux Devices > Device Configurations > Add... > BlackBerry Device > Start \gui Devices > \gui Add > \gui {BlackBerry Device} > \gui {Start Wizard}.
Wizard}.
\image qtcreator-qnx-device-configurations-wizard-1.png "Connection details" \image qtcreator-qnx-device-configurations-wizard-1.png "Connection details"
@@ -109,10 +108,10 @@
Click \gui{Next} and then \gui{Finish} to complete setting up the device Click \gui{Next} and then \gui{Finish} to complete setting up the device
connection. connection.
Once the device is added, you can edit the settings directly in the Once the device is added, you can edit the settings directly in \gui Tools >
\gui{Device Configurations} options page. \gui Options > \gui Devices.
\image qtcreator-qnx-device-configurations.png "Device Configurations" \image qtcreator-qnx-device-configurations.png "Devices"
\section1 Adding a QNX Neutrino Device in \QC \section1 Adding a QNX Neutrino Device in \QC

12
doc/src/qtcreator.qdoc
View File

@@ -86,10 +86,10 @@
\o \list \o \list
\o \bold {\l{Building and Running}} \o \bold {\l{Building and Running}}
\list \list
\o \l{Building for Multiple Targets} \o \l{Building for Multiple Platforms}
\o \l{Running on Multiple Targets} \o \l{Running on Multiple Platforms}
\o \l{Deploying to Mobile Devices} \o \l{Deploying to Mobile Devices}
\o \l{Connecting Mobile Targets} \o \l{Connecting Mobile Devices}
\endlist \endlist
\endlist \endlist
\o \list \o \list
@@ -231,15 +231,15 @@
\endlist \endlist
\o \l{Building and Running} \o \l{Building and Running}
\list \list
\o \l{Building for Multiple Targets} \o \l{Building for Multiple Platforms}
\o \l{Running on Multiple Targets} \o \l{Running on Multiple Platforms}
\o \l{Deploying to Mobile Devices} \o \l{Deploying to Mobile Devices}
\list \list
\o \l{Deploying Applications to Android Devices} \o \l{Deploying Applications to Android Devices}
\o \l{Deploying Applications to Linux-Based Devices} \o \l{Deploying Applications to Linux-Based Devices}
\o \l{Deploying Applications to QNX Devices} \o \l{Deploying Applications to QNX Devices}
\endlist \endlist
\o \l{Connecting Mobile Targets} \o \l{Connecting Mobile Devices}
\list \list
\o \l{Connecting Android Devices} \o \l{Connecting Android Devices}
\o \l{Connecting Embedded Linux Devices} \o \l{Connecting Embedded Linux Devices}

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

@@ -184,7 +184,7 @@
\image qmldesigner-new-project-harmattan-options.png "Harmattan Specific dialog" \image qmldesigner-new-project-harmattan-options.png "Harmattan Specific dialog"
\o In the \gui {Application icon} field, select the application \o In the \gui {Application icon} field, select the application
icon to use on Maemo or Harmattan targets, or use the default icon. icon to use on Maemo or Harmattan devices, or use the default icon.
The \gui {Project Management} dialog opens. The \gui {Project Management} dialog opens.