Merge remote-tracking branch 'origin/4.2'

Change-Id: I9006dd493707ae626ae3502541599c8789e1aab0
This commit is contained in:
Eike Ziller
2017-02-27 15:17:30 +01:00
28 changed files with 218 additions and 95 deletions

View File

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

View File

@@ -37,8 +37,8 @@
\title Connecting Mobile Devices
You can connect mobile devices to the development PC to build, run, debug,
and analyze applications on them from \QC. When you install Qt for a
You can connect mobile devices to the development PC to run, debug,
and analyze applications built for them from \QC. When you install Qt for a
target platform, such as Android or QNX, the build and run settings for the
development targets might be set up automatically in \QC.

View File

@@ -92,9 +92,9 @@
projects as \e {generic projects} and fully control the steps
and commands used to build the project.
\QC provides support for building, running, and deploying Qt
applications for desktop environment as well as embedded and
mobile devices. \l{glossary-buildandrun-kit}{Kits}, build,
\QC provides support for running and deploying Qt applications
built for the desktop environment as well as embedded and
mobile devices. \l{glossary-buildandrun-kit}{Kits}, build,
run, and deployment settings allow you to quickly switch between
different setups and target platforms.