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

Doc: Use defines to enable hiding device-related information

Browse Source 
Currently, only Android and embedded Linux devices are supported
by Qt Design Studio.

Change-Id: I10005f6a9cfeb93c99447796c1c9e6d47ab578de
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Leena Miettinen
2018-08-15 15:21:48 +02:00
parent 98b6fd26bf
commit c76db4d085
4 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/config/qtcreator-project.qdocconf
View File

@@ -51,6 +51,8 @@ include(macros.qdocconf)
include(qt-cpp-ignore.qdocconf) include(qt-cpp-ignore.qdocconf)
include(qt-defines.qdocconf) include(qt-defines.qdocconf)
defines += qtcreator
sources.fileextensions = "*.qdoc" sources.fileextensions = "*.qdoc"
qhp.projects = QtCreator qhp.projects = QtCreator

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

@@ -55,10 +55,14 @@
When you deploy the application to a generic Linux-based device, \QC When you deploy the application to a generic Linux-based device, \QC
copies the application files to the connected device. You can test copies the application files to the connected device. You can test
and debug the application on the device. and debug the application on the device.
\if defined(qtcreator)
\li \l{Deploying Applications to QNX Neutrino Devices} \li \l{Deploying Applications to QNX Neutrino Devices}
When you deploy the application to a QNX Neutrino device, \QC copies When you deploy the application to 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.
\endif
\endlist \endlist
*/ */

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

@@ -59,10 +59,12 @@
2.3.3, or later. You must install a Qt version targeting Android and 2.3.3, or later. You must install a Qt version targeting Android and
the Android SDK and NDK to develop for Android devices. the Android SDK and NDK to develop for Android devices.
\if defined(qtcreator)
\li \l{Connecting Bare Metal Devices} \li \l{Connecting Bare Metal Devices}
You can connect bare metal devices to the development PC and use \QC You can connect bare metal devices to the development PC and use \QC
to debug applications on them with GDB or a hardware debugger. to debug applications on them with GDB or a hardware debugger.
\endif
\li \l{Connecting Embedded Linux Devices} \li \l{Connecting Embedded Linux Devices}
@@ -70,6 +72,7 @@
Linux devices installed on the development Linux devices installed on the development
PC, you can add it and the device to \QC. PC, you can add it and the device to \QC.
\if defined(qtcreator)
\li \l{Connecting iOS Devices} \li \l{Connecting iOS Devices}
You use the tools delivered with Xcode to connect devices to \QC. You use the tools delivered with Xcode to connect devices to \QC.
@@ -82,9 +85,11 @@
debug applications on them from within \QC. This is currently only debug applications on them from within \QC. This is currently only
supported for QNX Neutrino devices, and requires the QNX SDK to be supported for QNX Neutrino devices, and requires the QNX SDK to be
installed on the development PC. installed on the development PC.
\endif
\endlist \endlist
\if defined(qtcreator)
\section1 Related Topics \section1 Related Topics
\list \list
@@ -97,4 +102,5 @@
local Linux PC, remote generic SSH Linux targets, or local Linux PC, remote generic SSH Linux targets, or
\l{Embedded Devices}{embedded devices}. \l{Embedded Devices}{embedded devices}.
\endlist \endlist
\endif
*/ */

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

@@ -76,5 +76,8 @@
\l{Specifying Run Settings}. \l{Specifying Run Settings}.
\include linux-mobile/creator-projects-running-generic-linux.qdocinc running on embedded linux \include linux-mobile/creator-projects-running-generic-linux.qdocinc running on embedded linux
\if defined(qtcreator)
\include qnx/creator-projects-running-qnx.qdocinc running on qnx \include qnx/creator-projects-running-qnx.qdocinc running on qnx
\endif
*/ */