diff --git a/doc/src/android/androiddev.qdoc b/doc/src/android/androiddev.qdoc index ab5f2614e68..fe99efddb1b 100644 --- a/doc/src/android/androiddev.qdoc +++ b/doc/src/android/androiddev.qdoc @@ -21,7 +21,7 @@ \contentspage index.html \previouspage creator-connecting-mobile.html \page creator-developing-android.html - \nextpage creator-developing-generic-linux.html + \nextpage creator-developing-bb10.html \title Connecting Android Devices diff --git a/doc/src/android/deploying-android.qdoc b/doc/src/android/deploying-android.qdoc index bf18592d42d..e0716542930 100644 --- a/doc/src/android/deploying-android.qdoc +++ b/doc/src/android/deploying-android.qdoc @@ -21,7 +21,7 @@ \contentspage index.html \previouspage creator-deployment.html \page creator-deploying-android.html - \nextpage creator-deployment-maemo.html + \nextpage creator-deployment-bb10.html \title Deploying Applications to Android Devices diff --git a/doc/src/linux-mobile/creator-deployment-madde.qdoc b/doc/src/linux-mobile/creator-deployment-madde.qdoc index 4c802b7874c..fdceddb5cab 100644 --- a/doc/src/linux-mobile/creator-deployment-madde.qdoc +++ b/doc/src/linux-mobile/creator-deployment-madde.qdoc @@ -24,7 +24,7 @@ /*! \contentspage index.html - \previouspage creator-deploying-android.html + \previouspage creator-deployment-bb10.html \page creator-deployment-maemo.html \nextpage creator-deployment-qnx.html diff --git a/doc/src/linux-mobile/linuxdev.qdoc b/doc/src/linux-mobile/linuxdev.qdoc index ebd4d8f22e2..f4accdcf028 100644 --- a/doc/src/linux-mobile/linuxdev.qdoc +++ b/doc/src/linux-mobile/linuxdev.qdoc @@ -19,7 +19,7 @@ /*! \contentspage index.html - \previouspage creator-developing-android.html + \previouspage creator-developing-bb10.html \page creator-developing-generic-linux.html \nextpage creator-developing-maemo.html diff --git a/doc/src/overview/creator-deployment-overview.qdoc b/doc/src/overview/creator-deployment-overview.qdoc index 4174b4f0fb7..f2fcaefc514 100644 --- a/doc/src/overview/creator-deployment-overview.qdoc +++ b/doc/src/overview/creator-deployment-overview.qdoc @@ -42,6 +42,11 @@ 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. + \li \l{Deploying Applications to BlackBerry 10 Devices} + + When you deploy the application to a BlackBerry 10 device, \QC generates a + BAR package in the build directory and deploys it to the connected + device. \li \l{Deploying Applications to Linux-Based Devices} When you deploy the application on a Linux-based device, such diff --git a/doc/src/overview/creator-mobile-targets.qdoc b/doc/src/overview/creator-mobile-targets.qdoc index d7d92f785f7..3eec3785a8d 100644 --- a/doc/src/overview/creator-mobile-targets.qdoc +++ b/doc/src/overview/creator-mobile-targets.qdoc @@ -51,6 +51,13 @@ Android version 1.6, or later. You must install the Qt for Android SDK to develop for Android devices. + \li \l{Connecting BlackBerry 10 Devices} + + \QC enables you to develop, deploy and debug your Qt applications + on BlackBerry 10. + You need to install the BlackBerry 10 NDK which contains a pre-built Qt. + You also need either a BlackBerry 10 device or the simulator. + \li \l{Connecting Embedded Linux Devices} If you have a tool chain for building applications for embedded diff --git a/doc/src/qnx/creator-deployment-bb10.qdoc b/doc/src/qnx/creator-deployment-bb10.qdoc new file mode 100644 index 00000000000..4ecfe9009d6 --- /dev/null +++ b/doc/src/qnx/creator-deployment-bb10.qdoc @@ -0,0 +1,46 @@ +/**************************************************************************** +** +** This file is part of Qt Creator +** +** Copyright (C) 2011 - 2013 Research In Motion +** +** Contact: Research In Motion (blackberry-qt@qnx.com) +** Contact: KDAB (info@kdab.com) +** +** +** GNU Free Documentation License +** +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of this +** file. +** +** +****************************************************************************/ + +// ********************************************************************** +// NOTE: the sections are not ordered by their logical order to avoid +// reshuffling the file each time the index order changes (i.e., often). +// Run the fixnavi.pl script to adjust the links to the index order. +// ********************************************************************** + +/*! + \contentspage index.html + \previouspage creator-deploying-android.html + \page creator-deployment-bb10.html + \nextpage creator-deployment-maemo.html + + \title Deploying Applications to BlackBerry 10 Devices + + To deploy Qt applications to BlackBerry 10 devices: + + \list 1 + \li Create a new project. To create an application with the native BlackBerry 10 look and feel, + select \gui File > \gui {New File or Project} > \gui {BlackBerry Qt Gui Application} > \gui Choose. + \li Select a BlackBerry 10 Kit for either device or simulator. + \li \QC will generate an additional application descriptor file to enable the packaging process. + \li You can use the BAR descriptor editor to customize the appearance and behavior of the application. + \endlist + + For more details please refer to the Qt-Project wiki page: \l {http://qt-project.org/wiki/BlackBerry} {http://qt-project.org/wiki/BlackBerry}. +*/ diff --git a/doc/src/qnx/creator-developing-bb10.qdoc b/doc/src/qnx/creator-developing-bb10.qdoc new file mode 100644 index 00000000000..5f7bdb11520 --- /dev/null +++ b/doc/src/qnx/creator-developing-bb10.qdoc @@ -0,0 +1,56 @@ +/**************************************************************************** +** +** This file is part of Qt Creator +** +** Copyright (C) 2011 - 2013 Research In Motion +** +** Contact: Research In Motion (blackberry-qt@qnx.com) +** Contact: KDAB (info@kdab.com) +** +** +** GNU Free Documentation License +** +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of this +** file. +** +** +****************************************************************************/ + +/*! + \contentspage index.html + \previouspage creator-developing-android.html + \page creator-developing-bb10.html + \nextpage creator-developing-generic-linux.html + + + \title Connecting BlackBerry 10 Devices + + \QC provides a plugin that enables you to develop for QNX and BlackBerry 10 platforms. + This page explains the basic steps to develop for BlackBerry 10 using \QC. + + The native BlackBerry 10 NDK includes Qt 4 (4.8.4 or newer) for both simulator (x86) and device (arm) targets available for development. Compared with the development for the PlayBook, Qt libraries are integrated in the BlackBerry 10 device firmware and can be used by Qt applications as shared libraries. + + Before starting to develop for BlackBerry 10 you need to download the following tools: + + \list + \li \l {https://developer.blackberry.com/native/} {The BlackBerry 10 Native SDK} + \li \l {https://developer.blackberry.com/native/} {The BlackBerry 10 Dev Alpha Simulator} if you do not have a BlackBerry DevAlpha device + \li \l {https://www.blackberry.com/SignedKeys/} {BlackBerry signing code keys} + \endlist + + + \section1 Setting Up BlackBerry 10 Environment in Qt Creator + + To set up your BlackBerry 10 environment in \QC: + + \list 1 + \li Select \gui Tools > \gui Options > \gui BlackBerry > \gui NDK to set your NDK path. + \li Select \gui Tools > \gui Options > \gui BlackBerry > \gui Keys to register and create a developer certificate. + \li Select \gui Tools > \gui Options > \gui Devices > \gui Add > \gui {Blackberry Device} to add a BlackBerry Device. You can add either the physical device or the simulator. + \li Create and upload a debug token bar file when adding the device from the wizard. + \endlist + + For more details please refer to the Qt-Project wiki page: \l {http://qt-project.org/wiki/BlackBerry} {http://qt-project.org/wiki/BlackBerry}. +*/ diff --git a/doc/src/qtcreator.qdoc b/doc/src/qtcreator.qdoc index 00a2beffc83..1853a432180 100644 --- a/doc/src/qtcreator.qdoc +++ b/doc/src/qtcreator.qdoc @@ -234,17 +234,18 @@ \li \l{Deploying to Mobile Devices} \list \li \l{Deploying Applications to Android Devices} + \li \l{Deploying BlackBerry 10 Devices} \li \l{Deploying Applications to Linux-Based Devices} \li \l{Deploying Applications to QNX Devices} \endlist \li \l{Connecting Mobile Devices} \list \li \l{Connecting Android Devices} + \li \l{Connecting BlackBerry 10 Devices} \li \l{Connecting Embedded Linux Devices} \li \l{Connecting Maemo Devices} \li \l{Connecting MeeGo Harmattan Devices} \li \l{Connecting QNX Devices} - \endlist \li \l{Customizing the Build Process} \li \l{Using Maemo or MeeGo Harmattan Emulator}