Doc: Added separation between PlayBook and QNX Neutrino devices

Change-Id: I52d15555b65b71d10cc08974b7860957976080e1
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>

9 files changed, 68 insertions, 32 deletions

diff --git a/doc/images/qtcreator-playbook-deployment.png b/doc/images/qtcreator-playbook-deployment.png
new file mode 100755
index 0000000000..7b3313c5ae
--- /dev/null
+++ b/doc/images/qtcreator-playbook-deployment.png
diff --git a/doc/images/qtcreator-qnx-deployment.png b/doc/images/qtcreator-qnx-deployment.png
index 7b3313c5ae..4e91687f34 100755..100644
--- a/doc/images/qtcreator-qnx-deployment.png
+++ b/doc/images/qtcreator-qnx-deployment.png
diff --git a/doc/src/overview/creator-deployment-overview.qdoc b/doc/src/overview/creator-deployment-overview.qdoc
index edfb0f8c59..94bbc19866 100644
--- a/doc/src/overview/creator-deployment-overview.qdoc
+++ b/doc/src/overview/creator-deployment-overview.qdoc
@@ -55,9 +55,11 @@
             Maemo 5 devices.
         \o \l{Deploying Applications to QNX Devices}
 
-            When you deploy the application on the \gui{QNX} target, \QC generates
-            a BAR package in the build directory and deploys it to the connected
-            device. You can test and debug the application on the device.
+            When you deploy the application on the \gui{QNX} target, depending
+            on your target device, \QC either generates a BAR package in the
+            build directory and deploys it to the connected device, or copies
+            the application files to the connected device. You can test and
+            debug the application on the device.
         \o  \l{Deploying Applications to Android Devices}
 
             When you deploy the application on the Android target, \QC copies
diff --git a/doc/src/overview/creator-mobile-targets.qdoc b/doc/src/overview/creator-mobile-targets.qdoc
index 31d62f9212..3b5e3313bf 100644
--- a/doc/src/overview/creator-mobile-targets.qdoc
+++ b/doc/src/overview/creator-mobile-targets.qdoc
@@ -78,8 +78,9 @@
 
             You can connect QNX devices to the development PC to deploy, run and
             debug applications on them from within \QC. This is currently only
-            supported for BlackBerry Playbook, and requires the BlackBerry NDK
-            to be installed on the development PC.
+            supported for BlackBerry Playbook and QNX Neutrino devices, and
+            requires the BlackBerry NDK or the QNX SDK to be installed on the
+            development PC.
 
         \o  \l{Connecting Android Devices}
 
diff --git a/doc/src/qnx/creator-deployment-qnx.qdoc b/doc/src/qnx/creator-deployment-qnx.qdoc
index 5726befbac..47a307d206 100644
--- a/doc/src/qnx/creator-deployment-qnx.qdoc
+++ b/doc/src/qnx/creator-deployment-qnx.qdoc
@@ -32,18 +32,23 @@
 
     \title Deploying Applications to QNX Devices
 
-    When you deploy the application on the \gui{QNX} target, \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}.
+    When you deploy the application on the \gui{QNX} target, depending on your
+    target device, \QC either generates a BAR package and installs it on the
+    connected device, or copies the application files to the device.
 
-    \image qtcreator-qnx-deployment.png "Deploy to device"
+    \section1 Deploying to BlackBerry Devices
+
+    For \gui{BlackBerry} targets, \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{Bar package}
+    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.
 
-    \section1 Application Descriptor File
+    \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
@@ -56,4 +61,23 @@
     descriptor file. For a full reference, see
     \l{https://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 \gui{QNX Neutrino} device is very similar to
+    \l{Deploying Applications to Linux-Based Devices}.
+
+    \image qtcreator-qnx-deployment.png "Deploy to device"
+
+    The files to be installed are listed in the \gui {Deployment} step,
+    the \gui {Files to install for subproject} field. The \gui {Local File Path}
+    field displays the location of the file on the development PC. The
+    \gui {Remote Directory} field displays the folder where the file is
+    installed on the device. Text in red color indicates that the information is
+    missing. Edit the qmake
+    \l{http://doc.qt.nokia.com/4.8/qmake-variable-reference.html#installs}
+    {INSTALLS variable} in the project .pro file to add the missing files.
+
+    When you run the application, \QC copies the necessary files to the device
+    and starts the application on it.
 */
diff --git a/doc/src/qnx/creator-developing-qnx.qdoc b/doc/src/qnx/creator-developing-qnx.qdoc
index db7c6309f8..acb142a8d5 100644
--- a/doc/src/qnx/creator-developing-qnx.qdoc
+++ b/doc/src/qnx/creator-developing-qnx.qdoc
@@ -77,11 +77,11 @@
     From the command line:
     \c{blackberry-nativepackage -installDebugToken ~/.rim/debugtoken.bar -device <device_ip> [-password <device_pass>]}
 
-    \section1 Adding a QNX Device in \QC
+    \section1 Adding a BlackBerry Device in \QC
 
-    Adding a QNX device is done using a wizard in the \gui{Device
+    Adding a BlackBerry device is done using a wizard in the \gui{Device
     Configurations} options. To launch it, go to \gui{Tools > Options >
-    Linux Devices > Device Configurations > Add... > QNX device > Start
+    Linux Devices > Device Configurations > Add... > BlackBerry Device > Start
     Wizard}.
 
     \image qtcreator-qnx-device-configurations-wizard-1.png "Connection details"
@@ -113,4 +113,10 @@
     \gui{Device Configurations} options page.
 
     \image qtcreator-qnx-device-configurations.png "Device Configurations"
+
+    \section1 Adding a QNX Neutrino Device in \QC
+
+    Adding a QNX Neutrino device is very similar to \l{Connecting Embedded
+    Linux Devices}, except you need to select \gui{QNX Device} in the
+    \gui{Device Configuration} wizard.
 */
diff --git a/doc/src/qnx/creator-projects-qt-version-qnx.qdocinc b/doc/src/qnx/creator-projects-qt-version-qnx.qdocinc
index fae40bb3de..a969c81510 100644
--- a/doc/src/qnx/creator-projects-qt-version-qnx.qdocinc
+++ b/doc/src/qnx/creator-projects-qt-version-qnx.qdocinc
@@ -9,13 +9,13 @@
 
     \image qtcreator-qt4-qtversions-win-qnx.png
 
-    If you have built your own version of Qt for QNX you need to add this manually to Qt Creator
-    using the above dialog:
+    If you have built your own version of Qt for QNX or BlackBerry you need to
+    add this manually to Qt Creator using the above dialog:
 
     \list 1
         \o Select \gui {Tools > Options > Build & Run > Qt Versions > Add}.
         \o Navigate to and select the qmake application that is part of your Qt for QNX build and select
         \gui {Open}.
-        \o In the \gui {Blackberry Native SDK} field enter the path to your installed Blackberry NDK.
+        \o In the \gui {Blackberry Native SDK} or \gui{QNX SDK} field enter the path to your installed Blackberry NDK or QNX SDK respectively.
         \o Select \gui {OK}.
     \endlist
diff --git a/doc/src/qnx/creator-projects-running-qnx.qdocinc b/doc/src/qnx/creator-projects-running-qnx.qdocinc
index eab2b06e79..7b0c57565f 100644
--- a/doc/src/qnx/creator-projects-running-qnx.qdocinc
+++ b/doc/src/qnx/creator-projects-running-qnx.qdocinc
@@ -7,9 +7,8 @@
         \o  Configure the device and specify a connection to it. For more
             information, see \l{Connecting QNX Devices}.
 
-        \o  Create an Application Descriptor File if it does not already exist.
-            For more information, see \l{Deploying Applications to QNX
-            Devices}.
+        \o  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}.
 
         \o  Click the \gui Run button.
 
@@ -18,10 +17,10 @@
     \QC uses the compiler specified in the QNX tool chain to build the
     application.
 
-    \QC generates a BAR package, installs it on the device, and
-    executes the selected application. The application views are displayed on
-    the device. Command-line output is visible in the \QC
-    \gui {Application Output} view.
+    If you are running on a BlackBerry device, \QC generates a BAR package,
+    installs it on the device, and executes the selected application. The
+    application views are displayed on the device. Command-line output is
+    visible in the \QC \gui {Application Output} view.
 
     \note Debugging is currently only fully supported on Linux and Mac OS.
     It is not possible to insert breakpoints during runtime on Windows.
@@ -29,9 +28,10 @@
     \section2 Troubleshooting Errors
 
     For the command-line output to show up in the \gui{Application Output}
-    view, \QC needs to be able to establish an SSH connection to the device.
+    view when running on a BlackBerry device, \QC needs to be able to establish
+    an SSH connection to the device.
     This is only possible if QNX Momentics is not running, and the SSH key
     configured for the device is a 4096-bit key.
 
     If these conditions are not met, you will get an error message saying debug
-    output cannot be shown.
\ No newline at end of file
+    output cannot be shown.
diff --git a/doc/src/qnx/creator-projects-settings-run-qnx.qdocinc b/doc/src/qnx/creator-projects-settings-run-qnx.qdocinc
index 244e119fa1..fe5a0a6bc1 100644
--- a/doc/src/qnx/creator-projects-settings-run-qnx.qdocinc
+++ b/doc/src/qnx/creator-projects-settings-run-qnx.qdocinc
@@ -1,13 +1,16 @@
     \section2 Specifying Run Settings for QNX Devices
 
-    To run and debug an application on a QNX device, you must create connections
-    from the development PC to the device. Click \gui {Manage device configurations}
-    to create a connection. For more information, see \l{Connecting QNX
-    Devices}.
+    To run and debug an application on a QNX or BlackBerry device, you must
+    create connections from the development PC to the device. Click
+    \gui {Manage device configurations} to create a connection. For more
+    information, see \l{Connecting QNX Devices}.
 
     \image qtcreator-qnx-run-settings.png "Run settings for QNX devices"
 
-    When you run the application on the QNX device, \QC first creates a BAR package
+    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 onto 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}.
\ No newline at end of file