aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2020-05-19 13:26:10 +0200
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2020-05-20 08:11:28 +0000
commit99dde0749575a39f7c7c25e45d420d0cc3e92ce4 (patch)
treebdf53543b095b0fb602ba47a916b1428e1997867
parentaf455fa40cf6159681d744b68b2a59d21accd3a7 (diff)
Doc: Update information about supported devices
Change-Id: I17aed738f147dedee69acaa9c3794394f92d12d3 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-rw-r--r--doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc2
-rw-r--r--doc/qtcreator/src/overview/creator-only/creator-mobile-targets.qdoc2
-rw-r--r--doc/qtcreator/src/overview/creator-only/creator-target-platforms.qdocinc41
-rw-r--r--doc/qtcreator/src/projects/creator-only/creator-projects-targets.qdoc33
4 files changed, 30 insertions, 48 deletions
diff --git a/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc b/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc
index c32e8854b0..2e931ee049 100644
--- a/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc
+++ b/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc
@@ -460,7 +460,7 @@
\list 1
\li Perf events may be globally disabled on your system. The
- preconfigured Boot to Qt images come with perf events enabled. For
+ preconfigured Boot2Qt images come with perf events enabled. For
a custom configuration you need to make sure that the file
\c {/proc/sys/kernel/perf_event_paranoid} contains a value smaller
than \c {2}. For maximum flexibility in recording traces you can
diff --git a/doc/qtcreator/src/overview/creator-only/creator-mobile-targets.qdoc b/doc/qtcreator/src/overview/creator-only/creator-mobile-targets.qdoc
index 97daacfd62..2451a07804 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-mobile-targets.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-mobile-targets.qdoc
@@ -114,7 +114,7 @@
You can use the experimental Qt Application Manager plugin
(commercial only) to deploy, run, and debug applications on the
local Linux PC, remote generic SSH Linux targets, or
- \l{Embedded Devices}{embedded devices}.
+ \l{Boot2Qt Devices}{Boot2Qt devices}.
\endlist
\endif
*/
diff --git a/doc/qtcreator/src/overview/creator-only/creator-target-platforms.qdocinc b/doc/qtcreator/src/overview/creator-only/creator-target-platforms.qdocinc
index 91a8193fea..e54514e1c3 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-target-platforms.qdocinc
+++ b/doc/qtcreator/src/overview/creator-only/creator-target-platforms.qdocinc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2019 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Creator documentation.
@@ -31,30 +31,21 @@
You can develop applications for the following platforms:
\list
-
\li Desktop
-
- \li Android
-
- \li Embedded
-
- \li Generic remote Linux
-
- \li iOS
-
- \li Microcontroller Units (MCU)
-
- \li QNX
-
- \li Universal Windows Platform (UWP)
-
- \li WebAssembly
-
+ \li \l{Connecting Android Devices}{Android}
+ \li \l{Connecting Bare Metal Devices}{Bare Metal}
+ \li Boot2Qt
+ \li \l{Connecting Embedded Linux Devices}{Generic Remote Linux}
+ \li \l{Connecting iOS Devices}{iOS}
+ \li \l{Connecting MCUs}{Microcontroller Units (MCU)} (commercial only)
+ \li \l{Connecting QNX Devices}{QNX}
+ \li \l{Qt for UWP}{Universal Windows Platform (UWP)}
+ \li \l{Building Applications for the Web}{WebAssembly}
\endlist
- \section2 Embedded Devices
+ \section2 Boot2Qt Devices
- The Boot to Qt stack can be made to run on a variety of hardware. For
+ The Boot2Qt stack can be made to run on a variety of hardware. For
Qt for Device Creation license holders, tooling is provided to customize the
contents of the stack as well as to take it into desired production
hardware.
@@ -65,8 +56,8 @@
\l{https://doc.qt.io/QtForDeviceCreation/index.html}{Qt for Device Creation}
documentation.
- \note Since \QC 4.9, only Boot to Qt version 5.9 and later are supported.
- To develop for earlier Boot to Qt versions, use \QC 4.8.
+ \note Since \QC 4.9, only Boot2Qt version 5.9 and later are supported.
+ To develop for earlier Boot2Qt versions, use \QC 4.8.
\section2 Mobile Devices
@@ -99,8 +90,8 @@
\li
\row
\li MCUs
- \li \image ok
- \li \image ok
+ \li
+ \li
\li \image ok
\row
\li QNX
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-targets.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-targets.qdoc
index e31a3d568a..d18817cfe4 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-targets.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-targets.qdoc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2019 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Creator documentation.
@@ -47,29 +47,20 @@
devices:
\list
-
- \li Android Device
-
- \li Bare Metal Device
-
- \li Boot2Qt Device (commercial only)
-
- \li \l {Emulator}{Boot2Qt Emulator Device} (commercial only)
-
- \li Generic Linux Device
-
- \li iOS Device
-
+ \li \l{Connecting Android Devices}{Android Device}
+ \li \l{Connecting Bare Metal Devices}{Bare Metal Device}
+ \li \l{https://doc.qt.io/QtForDeviceCreation/b2qt-installation-guides.html}
+ {Boot2Qt Device} (commercial only)
+ \li \l{Emulator}{Boot2Qt Emulator Device} (commercial only)
+ \li \l{Connecting Embedded Linux Devices}{Generic Remote Linux Device}
+ \li \l{Connecting iOS Devices}{iOS Device}
\li iOS Simulator
-
- \li QNX Device
-
- \li Windows Phone
-
+ \li \l{Connecting MCUs}{MCU Device} (commercial only)
+ \li \l{Connecting QNX Devices}{QNX Device}
+ \li \l{Building Applications for the Web}{WebAssembly Runtime}
+ \li \l{Qt for UWP}{Windows Phone}
\li Windows Phone Emulator
-
\li Windows Runtime (local)
-
\endlist
\section1 Filtering Kit Settings