diff options
| -rw-r--r-- | doc/config/qtcreator-project.qdocconf | 2 | ||||
| -rw-r--r-- | doc/src/overview/creator-deployment-overview.qdoc | 4 | ||||
| -rw-r--r-- | doc/src/overview/creator-mobile-targets.qdoc | 6 | ||||
| -rw-r--r-- | doc/src/projects/creator-projects-running.qdoc | 3 |
4 files changed, 15 insertions, 0 deletions
diff --git a/doc/config/qtcreator-project.qdocconf b/doc/config/qtcreator-project.qdocconf index 983fc3e895..58fceb2740 100644 --- a/doc/config/qtcreator-project.qdocconf +++ b/doc/config/qtcreator-project.qdocconf @@ -51,6 +51,8 @@ include(macros.qdocconf) include(qt-cpp-ignore.qdocconf) include(qt-defines.qdocconf) +defines += qtcreator + sources.fileextensions = "*.qdoc" qhp.projects = QtCreator diff --git a/doc/src/overview/creator-deployment-overview.qdoc b/doc/src/overview/creator-deployment-overview.qdoc index 86fbaa5488..7335591580 100644 --- a/doc/src/overview/creator-deployment-overview.qdoc +++ b/doc/src/overview/creator-deployment-overview.qdoc @@ -55,10 +55,14 @@ When you deploy the application to a generic Linux-based device, \QC copies the application files to the connected device. You can test and debug the application on the device. + + \if defined(qtcreator) \li \l{Deploying Applications to QNX Neutrino Devices} When you deploy the application to a QNX Neutrino device, \QC copies the application files to the connected device. You can test and debug the application on the device. + \endif + \endlist */ diff --git a/doc/src/overview/creator-mobile-targets.qdoc b/doc/src/overview/creator-mobile-targets.qdoc index ae7aa0a284..89398fbf56 100644 --- a/doc/src/overview/creator-mobile-targets.qdoc +++ b/doc/src/overview/creator-mobile-targets.qdoc @@ -59,10 +59,12 @@ 2.3.3, or later. You must install a Qt version targeting Android and the Android SDK and NDK to develop for Android devices. + \if defined(qtcreator) \li \l{Connecting Bare Metal Devices} You can connect bare metal devices to the development PC and use \QC to debug applications on them with GDB or a hardware debugger. + \endif \li \l{Connecting Embedded Linux Devices} @@ -70,6 +72,7 @@ Linux devices installed on the development PC, you can add it and the device to \QC. + \if defined(qtcreator) \li \l{Connecting iOS Devices} 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 supported for QNX Neutrino devices, and requires the QNX SDK to be installed on the development PC. + \endif \endlist + \if defined(qtcreator) \section1 Related Topics \list @@ -97,4 +102,5 @@ local Linux PC, remote generic SSH Linux targets, or \l{Embedded Devices}{embedded devices}. \endlist + \endif */ diff --git a/doc/src/projects/creator-projects-running.qdoc b/doc/src/projects/creator-projects-running.qdoc index 5e794f9bfb..342064856c 100644 --- a/doc/src/projects/creator-projects-running.qdoc +++ b/doc/src/projects/creator-projects-running.qdoc @@ -76,5 +76,8 @@ \l{Specifying Run Settings}. \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 + \endif */ |