Commit f278a87a authored by Leena Miettinen's avatar Leena Miettinen

Doc: refer to mobile targets in alphabetic order

Change-Id: I65b46b79757eea2f96e37c910359e62d4a4d0ba5
Reviewed-by: default avatarLeena Miettinen <riitta-leena.miettinen@nokia.com>
parent 77726ba1
......@@ -22,9 +22,9 @@
/*!
\contentspage index.html
\previouspage creator-developing-qnx.html
\previouspage creator-connecting-mobile.html
\page creator-developing-android.html
\nextpage creator-build-process-customizing.html
\nextpage creator-developing-generic-linux.html
\title Connecting Android Devices
......
......@@ -22,9 +22,9 @@
/*!
\contentspage index.html
\previouspage creator-deployment-qnx.html
\previouspage creator-deployment.html
\page creator-deploying-android.html
\nextpage creator-connecting-mobile.html
\nextpage creator-deployment-maemo.html
\title Deploying Applications to Android Devices
......
......@@ -25,7 +25,7 @@
/*!
\contentspage index.html
\previouspage creator-deployment.html
\previouspage creator-deploying-android.html
\page creator-deployment-maemo.html
\nextpage creator-deployment-qnx.html
......
......@@ -20,7 +20,7 @@
/*!
\contentspage index.html
\previouspage creator-developing-meego.html
\previouspage creator-developing-android.html
\page creator-developing-generic-linux.html
\nextpage creator-developing-maemo.html
......
......@@ -26,7 +26,7 @@
\previouspage creator-developing-meego.html
\endif
\page creator-developing-maemo.html
\nextpage creator-developing-qnx.html
\nextpage creator-developing-meego.html
\title Connecting Maemo Devices
......
......@@ -20,10 +20,10 @@
/*!
\contentspage index.html
\previouspage creator-connecting-mobile.html
\previouspage creator-developing-maemo.html
\page creator-developing-meego.html
\if defined(qcmanual)
\nextpage creator-developing-generic-linux.html
\nextpage creator-developing-qnx.html
\else
\nextpage creator-developing-maemo.html
\endif
......
......@@ -27,7 +27,7 @@
\contentspage index.html
\previouspage creator-running-targets.html
\page creator-deployment.html
\nextpage creator-deployment-maemo.html
\nextpage creator-deploying-android.html
\title Deploying to Mobile Devices
......@@ -38,26 +38,26 @@
\list
\o \l{Deploying Applications to Android Devices}
When you deploy the application on an Android device, \QC copies
the application files to the device. In addition, you can determine
the Qt libraries to use.
\o \l{Deploying Applications to Linux-Based Devices}
When you deploy the application on a Linux-based device, such
as \gui {Embedded Linux}, \gui Harmattan, or \gui{Maemo5}, \QC
as embedded Linux, MeeGo 1.2 Harmattan, or Maemo 5/Fremantle, \QC
copies the application files to the connected device. You
can test and debug the application on the device.
You can create Debian installation packages for MeeGo Harmattan and
Maemo 5 devices.
Maemo 5/Fremantle devices.
\o \l{Deploying Applications to QNX Devices}
When you deploy the application on a \gui{QNX} device, depending
When you deploy the application on a QNX device, 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 an Android device, \QC copies
the application files to the device. In addition, you can determine
the Qt libraries to use.
\endlist
\section1 Related Topics
......
......@@ -25,9 +25,9 @@
/*!
\contentspage index.html
\previouspage creator-deploying-android.html
\previouspage creator-deployment-qnx.html
\page creator-connecting-mobile.html
\nextpage creator-developing-meego.html
\nextpage creator-developing-android.html
\title Connecting Mobile Targets
......@@ -44,6 +44,15 @@
\list
\o \l{Connecting Android Devices}
Qt applications for Android are compiled as \c {shared objects} that
are loaded by a Java launcher generated by the Qt for Android SDK.
This is totally transparent to users. As Qt is composed of libraries
referencing each other, Qt applications are only supported on
Android version 1.6, or later. You must install the Qt for Android
SDK to develop for Android devices.
\o \l{Connecting Embedded Linux Devices}
If you have a tool chain for building applications for embedded
......@@ -51,6 +60,13 @@
PC, you can add it to \QC. Create device configurations and select
them in the \QC run settings.
\o \l{Connecting Maemo Devices}
Maemo 5 (Fremantle) is a Linux-based software platform developed by
Nokia and delivered on the Nokia N900. Use a connectivity tool (Mad
Developer) to create the device-side end point for USB and WLAN
connections.
\o \l{Connecting MeeGo Harmattan Devices}
MeeGo Harmattan is a Linux-based software platform developed by
......@@ -59,13 +75,6 @@
Use the SDK Connectivity tool that is preinstalled on the device to
create the device-side end point for USB and WLAN connections.
\o \l{Connecting Maemo Devices}
Maemo 5 (Fremantle) is a Linux-based software platform developed by
Nokia and delivered on the Nokia N900. Use a connectivity tool (Mad
Developer) to create the device-side end point for USB and WLAN
connections.
\o \l{Connecting QNX Devices}
You can connect QNX devices to the development PC to deploy, run and
......@@ -74,15 +83,6 @@
requires the BlackBerry NDK or the QNX SDK to be installed on the
development PC.
\o \l{Connecting Android Devices}
Qt applications for Android are compiled as \c {shared objects} that
are loaded by a Java launcher generated by the Qt for Android SDK.
This is totally transparent to users. As Qt is composed of libraries
referencing each other, Qt applications are only supported on
Android version 1.6, or later. You must install the Qt for Android
SDK to develop for Android devices.
\endlist
*/
......@@ -25,7 +25,7 @@
/*!
\contentspage index.html
\previouspage creator-developing-android.html
\previouspage creator-developing-qnx.html
\page creator-build-process-customizing.html
\nextpage creator-maemo-emulator.html
......
......@@ -49,8 +49,8 @@
\input projects/creator-projects-running-simulator.qdocinc
\if defined(qcmanual)
\input linux-mobile/creator-projects-running-madde.qdocinc
\input linux-mobile/creator-projects-running-generic-linux.qdocinc
\input linux-mobile/creator-projects-running-madde.qdocinc
\input qnx/creator-projects-running-qnx.qdocinc
\endif
......
......@@ -28,7 +28,7 @@
\contentspage index.html
\previouspage creator-deployment-maemo.html
\page creator-deployment-qnx.html
\nextpage creator-deploying-android.html
\nextpage creator-connecting-mobile.html
\title Deploying Applications to QNX Devices
......
......@@ -20,9 +20,9 @@
/*!
\contentspage index.html
\previouspage creator-developing-maemo.html
\previouspage creator-developing-meego.html
\page creator-developing-qnx.html
\nextpage creator-developing-android.html
\nextpage creator-build-process-customizing.html
\title Connecting QNX Devices
......
......@@ -235,17 +235,18 @@
\o \l{Running on Multiple Targets}
\o \l{Deploying to Mobile Devices}
\list
\o \l{Deploying Applications to Android Devices}
\o \l{Deploying Applications to Linux-Based Devices}
\o \l{Deploying Applications to QNX Devices}
\o \l{Deploying Applications to Android Devices}
\endlist
\o \l{Connecting Mobile Targets}
\list
\o \l{Connecting MeeGo Harmattan Devices}
\o \l{Connecting Android Devices}
\o \l{Connecting Embedded Linux Devices}
\o \l{Connecting Maemo Devices}
\o \l{Connecting MeeGo Harmattan Devices}
\o \l{Connecting QNX Devices}
\o \l{Connecting Android Devices}
\endlist
\o \l{Customizing the Build Process}
\o \l{Using Maemo or MeeGo Harmattan Emulator}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment