diff options
author | Leena Miettinen <riitta-leena.miettinen@nokia.com> | 2011-06-22 17:25:48 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@nokia.com> | 2011-06-23 10:53:34 +0200 |
commit | 24131890e6c6cd80c3654c72601d4f95ec88fbc5 (patch) | |
tree | 9a98e08f60f986bf9dfac9ebd607079d217f1690 /doc/maemodev.qdoc | |
parent | 9426bbe0aeb892727e4d6e4f5103a99aa47512af (diff) |
Doc: add Nokia N9 and update Harmattan info2.2
Change-Id: I5c1b88b18571530c5663bbecc2d4edd17d733dea
Reviewed-by: Christian Kandeler
Reviewed-on: http://codereview.qt.nokia.com/641
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Diffstat (limited to 'doc/maemodev.qdoc')
-rw-r--r-- | doc/maemodev.qdoc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/doc/maemodev.qdoc b/doc/maemodev.qdoc index d4c54312ca..e6c92d2e2e 100644 --- a/doc/maemodev.qdoc +++ b/doc/maemodev.qdoc @@ -49,9 +49,8 @@ information about the Maemo 5 platform, see \l{http://maemo.org/intro/platform/}{Software Platform} on the Maemo web site. - \omit - For more information about the Harmattan platform, see ##Add link. - \endomit + For more information about the Harmattan platform, see + \l{http://harmattan-dev.nokia.com/}{Harmattan Platform SDK}. \endif @@ -65,7 +64,8 @@ \note \QSDK does not contain the tool chains for building applications for other MeeGo devices than MeeGo Harmattan. You can try to run applications - from Qt Creator on other MeeGo devices, but it has not been tested, and the + from Qt Creator on other MeeGo devices, but it has not been extensively + tested, and the instructions might not always apply. \section1 Hardware and Software Requirements @@ -81,7 +81,7 @@ \o Maemo 5 device: Nokia N900 with software update release 1.3 (V20.2010.36-2) or later installed. - \o Harmattan device: Nokia N950 + \o Harmattan device: Nokia N950, Nokia N9 \endlist @@ -118,7 +118,7 @@ To use a WLAN connection, you must activate WLAN on the device and connect it to the same WLAN as the development PC. The network address is displayed - in the Mad Developer. + in the connectivity tool. To use a USB connection, you need to set up the device as a network device on the development PC. @@ -127,16 +127,16 @@ WLAN, you can ignore the USB-specific parts in the following sections. - \section2 Starting SDK Connectivity on Nokia N950 + \section2 Starting SDK Connectivity on Harmattan Devices - SDK Connectivity application is preinstalled in the Nokia N950 and + SDK Connectivity application is preinstalled in Harmattan devices and available in developer mode. To start SDK Connectivity: \list - \o On the Nokia N950, select \gui {Settings > Security > Developer + \o On the device, select \gui {Settings > Security > Developer mode} to turn on developer mode. \o Select \gui {Applications > SDK Connectivity} to start the SDK @@ -298,7 +298,7 @@ You can protect the connections between Qt Creator and a device by using either a password or an SSH key. If you use a password, you must generate it in the connectivity tool and enter it in Qt Creator every time - you connect to the device. + you start the connectivity tool. If you do not have an SSH key, you can create it in Qt Creator. Encrypted keys are not supported. For more |