diff options
author | El Mehdi Fekari <mfekari@blackberry.com> | 2014-03-24 17:43:06 +0100 |
---|---|---|
committer | Mehdi Fekari <mfekari@blackberry.com> | 2014-03-25 11:09:31 +0100 |
commit | 5d5e98f0db1e6f2d1dc050a58fb5be8dd1476294 (patch) | |
tree | e976d525c4ca106b113fccb0acb1c832758849e9 | |
parent | 258197d74bd28d01e88335317961566083f1c65b (diff) |
Doc: Remove unrelated Qnx details
The creator-deployment-qnx contains details about deploying
BlackBerry projects using the BAR file descriptor, which doesn't
apply for all pure Qnx plarforms.
Change-Id: Iecfc2626b0de4ed016ef937b410e439c3bdc740a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
-rw-r--r-- | doc/src/overview/creator-deployment-overview.qdoc | 2 | ||||
-rw-r--r-- | doc/src/qnx/creator-deployment-qnx.qdoc | 36 | ||||
-rw-r--r-- | doc/src/qnx/creator-projects-running-qnx.qdocinc | 4 | ||||
-rw-r--r-- | doc/src/qnx/creator-projects-settings-run-qnx.qdocinc | 12 | ||||
-rw-r--r-- | doc/src/qtcreator.qdoc | 2 |
5 files changed, 14 insertions, 42 deletions
diff --git a/doc/src/overview/creator-deployment-overview.qdoc b/doc/src/overview/creator-deployment-overview.qdoc index d2d0f9654d..9d41e878d3 100644 --- a/doc/src/overview/creator-deployment-overview.qdoc +++ b/doc/src/overview/creator-deployment-overview.qdoc @@ -52,7 +52,7 @@ 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. - \li \l{Deploying Applications to QNX Devices} + \li \l{Deploying Applications to QNX Neutrino Devices} When you deploy the application to a BlackBerry, \QC generates a BAR package in the build directory and deploys it to the connected diff --git a/doc/src/qnx/creator-deployment-qnx.qdoc b/doc/src/qnx/creator-deployment-qnx.qdoc index 1c94d4ee4e..80f0f1a124 100644 --- a/doc/src/qnx/creator-deployment-qnx.qdoc +++ b/doc/src/qnx/creator-deployment-qnx.qdoc @@ -30,40 +30,10 @@ \page creator-deployment-qnx.html \nextpage creator-connecting-mobile.html - \title Deploying Applications to QNX Devices + \title Deploying Applications to QNX Neutrino Devices - You can deploy applications to BlackBerry and QNX Neutrino devices. - - \section1 Deploying to BlackBerry Devices - - For BlackBerry devices, \QC generates a BAR package in the build - directory and installs it on the connected device. The contents of the BAR - package are specified in the \gui{Application Descriptor File}. - - \image qtcreator-playbook-deployment.png "Deploy to device" - - The name of the generated BAR package is shown in the \gui{Package} - setting. If the package already exists, it will be overwritten without - prior notification. - - \section2 Application Descriptor File - - The application descriptor file needs to be created manually, - or you can use the \gui{Application Descriptor} wizard to have a generic - template generated. The wizard is available in \gui {File > New File or - Project > BlackBerry > Application descriptor}. This wizard will also - include a splashscreen.png and an icon.png file which are included in the - application descriptor file. - - To tailor your BAR packages, you will have to manually edit the application - descriptor file. For a full reference, see - \l{http://bdsc.webapps.blackberry.com/native/documentation/com.qnx.doc.native_sdk.devguide/com.qnx.doc.native_sdk.devguide/topic/r_blackberry_tablet_dtd_intro.html} - {Document Type Definition (DTD) for the application descriptor file}. - - \section1 Deploying to QNX Neutrino Devices - - Deploying applications to a QNX Neutrino device is very similar to - \l{Deploying Applications to Embedded Linux Devices}. + You can deploy applications to QNX Neutrino devices in the way that is described + in \l{Deploying Applications to Embedded Linux Devices}. \image qtcreator-qnx-deployment.png "Deploy to device" diff --git a/doc/src/qnx/creator-projects-running-qnx.qdocinc b/doc/src/qnx/creator-projects-running-qnx.qdocinc index 35357338d2..7a726b4bdd 100644 --- a/doc/src/qnx/creator-projects-running-qnx.qdocinc +++ b/doc/src/qnx/creator-projects-running-qnx.qdocinc @@ -7,8 +7,8 @@ \li Configure the device and specify a connection to it. For more information, see \l{Connecting QNX Devices}. - \li If you are running on a BlackBerry device, create an Application - Descriptor File if it does not already exist. For more information, see \l{Deploying Applications to QNX Devices}. + \li If you are running on a BlackBerry 10 device, create an Application + Descriptor File if it does not already exist. For more information, see \l{Deploying Applications to BlackBerry 10 Devices}. \li Make sure that your kit has your QNX or BlackBerry 10 device set. diff --git a/doc/src/qnx/creator-projects-settings-run-qnx.qdocinc b/doc/src/qnx/creator-projects-settings-run-qnx.qdocinc index 81335582fa..180f7f76ee 100644 --- a/doc/src/qnx/creator-projects-settings-run-qnx.qdocinc +++ b/doc/src/qnx/creator-projects-settings-run-qnx.qdocinc @@ -7,10 +7,12 @@ \image qtcreator-qnx-run-settings.png "Run settings for QNX devices" - When you run the application on the BlackBerry device, \QC first creates a BAR package - using the settings in the Application Descriptor File. The default is to create the - BAR package in the build directory. The BAR package is then deployed to the - selected device. For more information, see \l{Deploying Applications to QNX Devices}. - Specifying run settings for QNX Neutrino devices is very similar to \l{Specifying Run Settings for Linux-Based Devices}. + + \section2 Specifying Run Settings for Blackberry 10 Devices + + When you run the application on the BlackBerry 10 device, \QC first creates a BAR package + using the settings in the Application Descriptor File. The default is to create the + BAR package in the build directory. The BAR package is then deployed to the + selected device. For more information, see \l{Deploying Applications to BlackBerry 10 Devices}. diff --git a/doc/src/qtcreator.qdoc b/doc/src/qtcreator.qdoc index e30f55810b..83f86077c9 100644 --- a/doc/src/qtcreator.qdoc +++ b/doc/src/qtcreator.qdoc @@ -217,7 +217,7 @@ \li \l{Deploying Applications to Android Devices} \li \l{Deploying Applications to BlackBerry 10 Devices} \li \l{Deploying Applications to Embedded Linux Devices} - \li \l{Deploying Applications to QNX Devices} + \li \l{Deploying Applications to QNX Neutrino Devices} \endlist \li \l{Connecting Mobile Devices} \list |