Doc: Harmattan targetv2.2.1

Reviewed-by: Christian Kandeler

Change-Id: Ica62fc3f04bbc4b0fea84ff44399ac12ea44c0da
Reviewed-on: http://codereview.qt.nokia.com/587
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>

6 files changed, 254 insertions, 130 deletions

diff --git a/doc/images/qmldesigner-new-project-qt-versions.png b/doc/images/qmldesigner-new-project-qt-versions.png
index fb040d7543..5c07bf50b4 100644
--- a/doc/images/qmldesigner-new-project-qt-versions.png
+++ b/doc/images/qmldesigner-new-project-qt-versions.png
diff --git a/doc/images/qtcreator-gs-build-example-targets.png b/doc/images/qtcreator-gs-build-example-targets.png
index d6fb487340..6522822637 100644
--- a/doc/images/qtcreator-gs-build-example-targets.png
+++ b/doc/images/qtcreator-gs-build-example-targets.png
diff --git a/doc/images/qtcreator-maemo-deb-package.png b/doc/images/qtcreator-maemo-deb-package.png
index e6ad5f5df2..8c4095a984 100644
--- a/doc/images/qtcreator-maemo-deb-package.png
+++ b/doc/images/qtcreator-maemo-deb-package.png
diff --git a/doc/images/qtcreator-mobile-project-qt-versions.png b/doc/images/qtcreator-mobile-project-qt-versions.png
index 2ed565e454..18a6a76495 100644
--- a/doc/images/qtcreator-mobile-project-qt-versions.png
+++ b/doc/images/qtcreator-mobile-project-qt-versions.png
diff --git a/doc/maemodev.qdoc b/doc/maemodev.qdoc
index 8f62cd6af6..d4c54312ca 100644
--- a/doc/maemodev.qdoc
+++ b/doc/maemodev.qdoc
@@ -34,20 +34,25 @@
     \nextpage smartinstaller.html
     \endif
 
-    \title Connecting Maemo Devices
+    \title Connecting Maemo and MeeGo Harmattan Devices
 
-    Maemo 5 (Fremantle) is a software platform developed by Nokia for
-    smartphones. The Maemo 5 SDK provides an open development environment
-    for different applications on top of the Maemo platform. The necessary
-    tools from the Maemo 5 SDK are also included in the \QSDK.
+    Maemo 5 (Fremantle) and MeeGo Harmattan are Linux-based software platforms
+    developed by Nokia for mobile devices. They allow developers to create
+    applications using the Qt framework.
     The whole tool chain that you need to create, build, debug, run, and deploy
-    Maemo 5 applications is installed and configured when you install the
+    Maemo 5 and Harmattan applications is installed and configured when you
+    install the
     \QSDK.
 
     \if defined(qcmanual)
-    Maemo 5 is based on the Linux 2.6 operating system. For more
+    For more
     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
+
     \endif
 
     For more information about developing applications for the Maemo 5
@@ -55,20 +60,34 @@
     or see
     \l{http://doc.qt.nokia.com/qt-maemo/platform-notes-maemo5.html}{Platform Notes - Maemo 5}.
 
+    For more information about developing applications for the Harmattan
+    platform, select \gui {Help > Index} and look for \gui {Platform Notes}.
+
+    \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
+    instructions might not always apply.
+
     \section1 Hardware and Software Requirements
 
-    To build and run Qt applications for Maemo 5, you need the following:
+    To build and run Qt applications for Maemo 5 or Harmattan, you need the
+    following:
     \list
-       \o  Nokia N900 device with software update release 1.3 (V20.2010.36-2)
-       or later installed.
+
+        \o  Test device:
+
+            \list
+
+                \o  Maemo 5 device: Nokia N900 with software update release 1.3
+                    (V20.2010.36-2) or later installed.
+
+                \o  Harmattan device: Nokia N950
+
+            \endlist
 
        \if defined(qcmanual)
        \o  MADDE cross-platform Maemo development
            tool (installed as part of the \QSDK).
-
-           For more information about MADDE pertaining to its
-           installation, configuration, and deployment on the device, see
-          \l{http://wiki.maemo.org/MADDE}{Introduction to MADDE}.
        \endif
 
        \o Nokia USB drivers.
@@ -83,15 +102,16 @@
 
     \endlist
 
-    \note The only supported build system for Maemo 5 in Qt
+    \note The only supported build system for Maemo 5 and Harmattan in Qt
     Creator is qmake.
 
-    \section1 Setting Up the Nokia N900
+    \section1 Setting Up Connectivity in Devices
 
     You can connect your device to your development PC using either a USB or
     WLAN connection.
 
-    For the device, you need to use a tool called Mad Developer to create the
+    For the device, you need to use a connectivity tool (Mad Developer on
+    Maemo 5 and SDK Connectivity on Harmattan) to create the
     device-side end point for USB and WLAN connections. It provides no
     diagnostics functions but is essential for creating connections between the
     device and your development PC.
@@ -100,16 +120,44 @@
     it to the same WLAN as the development PC. The network address is displayed
     in the Mad Developer.
 
-    To use a USB connection, you need to set up the Nokia N900 as a network device
+    To use a USB connection, you need to set up the device as a network device
     on the development PC.
 
-    \note If you plan to connect your development PC to the Nokia N900 only over WLAN, you can
+    \note If you plan to connect your development PC to the device only over
+    WLAN, you can
     ignore the USB-specific parts in the following sections.
 
-    \section2 Installing and Configuring Mad Developer
+    \section2 Starting SDK Connectivity on Nokia N950
+
+    SDK Connectivity application is preinstalled in the Nokia N950 and
+    available in developer mode.
+
+    To start SDK Connectivity:
+
+    \list
+
+        \o  On the Nokia N950, select \gui {Settings > Security > Developer
+            mode} to turn on developer mode.
+
+        \o  Select \gui {Applications > SDK Connectivity} to start the SDK
+            Connectivity application.
+
+        \o  Select \gui {Select Connection} and then select the type of the
+            connection to create: \gui WLAN or \gui USB.
+
+        \o  For a USB connection, select the operating system of the
+            development PC in \gui {Select Module}.
+
+    \endlist
+
+    \gui {Connectivity Details} displays the IP address and developer password.
+    The address 192.168.2.15 is used by default. You must enter the password in
+    Qt Creator.
+
+    \section2 Installing and Configuring Mad Developer on Nokia N900
 
-    Install Mad Developer on a device and configure
-    a connection between the development PC and the device.
+    Install Mad Developer on a Nokia N900 device and configure
+    a connection between the development PC and a device.
 
     \note The following instructions describe Mad Developer 2.1. The process and
     text labels might differ on other Mad Developer versions.
@@ -149,10 +197,11 @@
           \image qtcreator-mad-developer-screenshot.png
     \endlist
 
-    \section1 Installing Qt Mobility APIs
+    \section1 Installing Qt Mobility Libraries
 
     To develop applications that use the Qt Mobility APIs, you must install the
-    APIs on the devices. The APIs are not available in the Nokia N900 package
+    Qt Mobility Libraries on the devices. The APIs are not available in the
+    device package
     manager, and therefore, you must install them from the command line as the
     root user:
 
@@ -182,8 +231,8 @@
     for its USB connection by default, so you can create the network interface
     with a different address inside the same subnet too.
 
-    \note If you have changed the IP address of the device when configuring
-    Mad Developer, you need to reflect those changes in your development PC USB
+    \note If you have changed the IP address of the device in the connectivity
+    tool, you need to reflect those changes in your development PC USB
     network settings.
 
     Run the following command in a shell as root user:
@@ -219,15 +268,14 @@
 
     Depending on
     your version of Microsoft Windows you may have to unplug and re-plug the
-    Nokia N900 to reload the driver with its configuration accordingly.
+    device to reload the driver with its configuration accordingly.
 
     \section1 Configuring Connections in Qt Creator
 
-    To be able to run and debug applications on the Maemo emulator and
-    devices, you must set up connections to the emulator and devices in the
-    Qt Creator build and run settings.
-    If you install \QSDK, the
-    connection to the Maemo emulator is configured automatically and you
+    To be able to run and debug applications on the Maemo or MeeGo Harmattan
+    emulator and devices, you must set up connections to the emulator and
+    devices in the Qt Creator build and run settings. If you install \QSDK, the
+    connection to the emulator is configured automatically and you
     only need to configure a connection to the device.
 
     You use a wizard to create the connections. You can edit the settings later
@@ -248,9 +296,9 @@
 
 
     You can protect the connections between Qt Creator and
-    a Maemo device by using either a password or an SSH key. If you use a password, you
-    must generate it in Mad Developer and enter it in Qt Creator every time
-    you connect to the Maemo device.
+    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.
 
     If you do not have an SSH key, you can create it in Qt Creator.
     Encrypted keys are not supported. For more
@@ -262,12 +310,12 @@
     \endif
 
 
-    To configure connections between Qt Creator and the Maemo
+    To configure connections between Qt Creator and a
     device:
 
     \list 1
 
-        \o  To deploy applications and run them remotely on Maemo devices,
+        \o  To deploy applications and run them remotely on devices,
             specify parameters for accessing devices:
 
             \list a
@@ -295,7 +343,7 @@
             \gui {Hardware device}.
 
             \o In the \gui {The device's host name or IP address} field, enter
-            the IP address from the \gui usb0 or \gui wlan0 field in Mad Developer.
+            the IP address from the connectivity tool on the device.
 
             \o Click \gui Next.
 
@@ -305,7 +353,7 @@
 
         \if defined(qcmanual)
 
-        \o To test applications on the Maemo emulator (QEMU) separately, you must
+        \o To test applications on the emulator (QEMU) separately, you must
            create a connection to it from the development PC. If you installed
            \QSDK, the connection is created automatically and you can omit this
            step.
@@ -340,7 +388,7 @@
             \list a
 
                 \o Open a project for an application you want to develop for your
-                Nokia N900.
+                device.
 
                 \o Click \gui Projects to open the projects mode.
 
@@ -354,7 +402,7 @@
                  give it a new name, click \gui Rename.
 
                  \o In the \gui {Device configuration} field, select the device
-                 connection or the Maemo emulator connection.
+                 connection or the emulator connection.
                  \image qtcreator-screenshot-run-settings.png
 
                  \o Click \gui {<no target path set>} in \gui {Remote Directory}
@@ -391,7 +439,7 @@
 
          If you do not have an SSH public and private key pair, you can generate it
          in Qt Creator. You can specify key length and the key algorithm, RSA or DSA.
-         If you only use the keys to protect connections to the Maemo emulator or
+         If you only use the keys to protect connections to the emulator or
          device, you can use the default values.
 
          \list 1
@@ -415,7 +463,8 @@
 
     \section2 Managing Device Processes
 
-    You can view processes running on the Maemo device and kill them.
+    You can view processes running on the Maemo or MeeGo Harmattan device and
+    kill them.
     Select \gui {Tools > Options... > Maemo > Maemo Device Configurations >
     Remote Processes...}.
 
@@ -438,7 +487,7 @@
     \table
 
         \header
-            \o usb0 in Mad Developer on Device
+            \o IP Address and Network on Device
             \o USB Network on Development PC
             \o Host Name in Qt Creator Build Settings
 
diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index df1101a310..15f0a690a6 100644
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -65,7 +65,7 @@
                 \o \l{Creating a Project}
                 \o \l{Opening a Project}
                 \o \l{Adding Libraries to Projects}
-                \o \l{Connecting Maemo Devices}
+                \o \l{Connecting Maemo and MeeGo Harmattan Devices}
                 \o \l{Connecting Symbian Devices}
                 \o \l{Managing Sessions}
             \endlist
@@ -129,7 +129,7 @@
        \o \l{Deploying Applications to Mobile Devices}
             \list
                 \o \l{Deploying Applications to Symbian Devices}
-                \o \l{Deploying Applications to Maemo Devices}
+                \o \l{Deploying Applications to Maemo or MeeGo Harmattan Devices}
                 \o \l{Publishing Maemo Applications to Extras-devel}
                 \o \l{Publishing Applications to Ovi Store}
                 \o \l{Building with Remote Compiler}
@@ -144,7 +144,7 @@
                \o \l{Using Version Control Systems}
                \o \l{Adding Qt Designer Plugins}
                \o \l{Using External Tools}
-               \o \l{Using the Maemo Emulator}
+               \o \l{Using Maemo or MeeGo Harmattan Emulator}
                \o \l{Editing MIME Types}
                \o \l{Showing Task List Files in the Build Issues Pane}
                \o \l{Using Command Line Options}
@@ -337,10 +337,12 @@
     or CMake, and specify that Qt Creator ignores your build system.
 
     Qt Creator provides support for building and running Qt applications for
-    desktop environment (Windows, Linux, and Mac OS) and mobile devices (Symbian and Maemo).
+    desktop environment (Windows, Linux, and Mac OS) and mobile devices
+    (Symbian, Maemo, and MeeGo Harmattan).
     Build settings allow you to quickly switch between build targets.
 
-    When you install the \QSDK, the build and run settings for the Maemo and Symbian
+    When you install the \QSDK, the build and run settings for the Harmattan,
+    Maemo, and Symbian
     targets are set up automatically. However, you need to install and configure some
     additional software on the devices to be able to connect to them from the
     development PC.
@@ -357,8 +359,9 @@
     You can connect mobile devices to your development PC and debug processes
     running on the devices.
 
-    You can test applications that are intended for mobile devices in the Qt
-    Simulator and Maemo Emulator, but you also need to test the applications
+    You can test applications that are intended for mobile devices in Qt
+    Simulator and Maemo or MeeGo Harmattan emulator, but you also need to test
+    the applications
     on real devices.
 
     \section2 Debuggers
@@ -438,16 +441,21 @@
     The Qt Simulator is installed as part of the \QSDK. After it is
     installed, you can select it as a build target in Qt Creator.
 
-    \section2 Maemo Emulator
+    \section2 Maemo and MeeGo Harmattan Emulator
+
+    The Maemo 5 (Fremantle) and MeeGo Harmattan emulator are installed as part
+    of the \QSDK. After they are installed, you can start them from Qt Creator.
 
     The Maemo 5 emulator emulates the Nokia N900 device environment. You can test
     applications in conditions practically identical to running the application
     on a Nokia N900 device with the software update release 1.3 (V20.2010.36-2).
-    However, it is faster to test on a real device connected to the development
-    PC.
 
-    The Maemo Emulator is installed as part of the \QSDK. After it is
-    installed, you can start it from Qt Creator.
+    The Harmattan emulator emulates the Nokia N950 device environment.
+
+    With the emulators, you can test how your application reacts to hardware
+    controls, such as the power button, and to the touch screen.
+    Usually, it is faster to test on a real device connected to the development
+    PC than to use the emulators.
 
     \section1 Deploying
 
@@ -456,7 +464,8 @@
     The files can be copied to a location in the file system of the development PC
     or to a mobile device.
 
-    Qt Creator allows you to create installation packages for Symbian and Maemo
+    Qt Creator allows you to create installation packages for Symbian, Maemo,
+    and MeeGo Harmattan
     devices that are suitable for publishing on Ovi Store and other channels.
 
 */
@@ -521,6 +530,8 @@
 
         \o Maemo 5
 
+        \o MeeGo Harmattan
+
         \o Symbian
 
     \endlist
@@ -530,12 +541,13 @@
 
     \table
         \header
-            \o {1,4} Operating system
-            \o {4,1} Platform
+            \o {1,5} Operating system
+            \o {5,1} Platform
         \header
             \o Desktop
             \o Qt Simulator
-            \o Maemo
+            \o Maemo 5
+            \o MeeGo Harmattan
             \o Symbian
 
         \row
@@ -544,17 +556,20 @@
             \o Yes
             \o Yes
             \o Yes
+            \o Yes
         \row
             \o Linux
             \o Yes
             \o Yes
             \o Yes
+            \o Yes
             \o Yes (by using Remote Compiler for building)
         \row
             \o Mac OS X
             \o Yes
             \o Yes
             \o Yes
+            \o Yes
             \o Yes (by using Remote Compiler for building)
     \endtable
 */
@@ -3040,7 +3055,8 @@
     Compiler, is installed as a part of the \QSDK. For more information, see
     \l{Building with Remote Compiler}.
 
-    When you install the \QSDK, the build and run settings for the Maemo and
+    When you install the \QSDK, the build and run settings for the Maemo, MeeGo
+    Harmattan, and
     Symbian targets are set up automatically. However, you need to install and
     configure some additional software on the devices to be able to connect to
     them from the development PC.
@@ -3056,7 +3072,7 @@
         \o \l{Creating a Project}
         \o \l{Opening a Project}
         \o \l{Adding Libraries to Projects}
-        \o \l{Connecting Maemo Devices}
+        \o \l{Connecting Maemo and MeeGo Harmattan Devices}
         \o \l{Connecting Symbian Devices}
         \o \l{Managing Sessions}
     \endlist
@@ -3285,7 +3301,7 @@
 
     By default, Qt Creator does a \l{glossary-shadow-build}{shadow build} and also
     creates the directory. However, shadow building is not supported for the Symbian
-    Devices or Maemo5 target on Windows.
+    Devices, Maemo5, or Harmattan target on Windows.
 
     If you have built the project before, Qt Creator can use the existing build
     configuration to make the exact same build as found in the directory available to
@@ -3796,7 +3812,7 @@
     Qt Creator allows you to have multiple versions of Qt installed on
     your development PC and use different versions to build your projects for
     different targets. For example, \QSDK contains special Qt versions for
-    Maemo and Symbian development.
+    MeeGo Harmattan, Maemo, and Symbian development.
 
     Qt Creator checks the directories listed in the \c{PATH} environment
     variable for the qmake executable. If a qmake executable is found, it is
@@ -4303,21 +4319,22 @@
     For more information about using the Qt Simulator, see the
     \l{http://doc.qt.nokia.com/qtsimulator/index.html}{Qt Simulator Manual}.
 
-    \section1 Running on Maemo
+    \section1 Running on Maemo or MeeGo Harmattan
 
     \list 1
 
         \o Build and run the application for \l{Running on Qt Simulator}{Qt Simulator}.
 
-        \o Build and run the application for \l{Using the Maemo Emulator}{Maemo Emulator}.
+        \o  Build and run the application for
+            \l{Using Maemo or MeeGo Harmattan Emulator}
+            {the Maemo or MeeGo Harmattan emulator}.
 
         \o Alternatively, you can build and run the application for a device:
 
         \list 1
 
-        \o Set up the MADDE development environment and specify a connection
-        to the device. For more information, see
-        \l{Connecting Maemo Devices}.
+        \o  Configure the device and specify a connection to it. For more
+            information, see \l{Connecting Maemo and MeeGo Harmattan Devices}.
 
         \o Connect the device to the development PC.
 
@@ -4332,13 +4349,14 @@
 
         Qt Creator generates an installation package, installs it on the device,
         and executes the selected application.
-        The application views are displayed on the Nokia N900.
+        The application views are displayed on the device.
         Command-line
         output is visible in the Qt Creator \gui {Application Output} view.
 
         Choose \gui {Projects > Maemo Run} to view the settings for deploying the
         application on the connected device and creating the installation package.
-        For more information, see \l{Specifying Run Settings for Maemo Devices}.
+        For more information, see
+        \l{Specifying Run Settings for Maemo and MeeGo Harmattan Devices}.
 
         Debugging also works transparently.
 
@@ -4443,7 +4461,8 @@
 
     The \gui {Remote Compiler} target is an interface to a compilation service at
     Forum Nokia. It provides a simple, standardized environment for building Qt
-    applications and creating installation packages for Symbian and Maemo devices
+    applications and creating installation packages for Symbian, Maemo, and
+    MeeGo Harmattan devices
     when you do not have the necessary tool chains and SDKs installed or they are
     not supported on the development PC. You can choose from a set of supported
     devices, such as S60 3rd Edition or S60 5th Edition devices.
@@ -4540,7 +4559,8 @@
                This keeps the files generated for each target platform separate.
 
                \note Shadow building is not supported by the Symbian build system.
-               Also, shadow building on Windows is not supported for Maemo.
+               Also, shadow building on Windows is not supported for Maemo or
+               MeeGo Harmattan.
                If you only build for one target platform, you can deselect
                the \gui{Shadow build} checkbox.
     \endlist
@@ -4741,30 +4761,35 @@
     publishing and installing applications on Symbian devices. For more information,
     see \l{Deploying Applications to Symbian Devices}.
 
-    \section2 Specifying Run Settings for Maemo Devices
+    \section2 Specifying Run Settings for Maemo and MeeGo Harmattan Devices
 
-    To run an application on a Maemo device, create and select
-    a device configuration in the Maemo run settings for your project.
+    To run an application on a Maemo or MeeGo Harmattan device, create and
+    select a device configuration in the Maemo 5 or Harmattan run settings for
+    your project.
     You can also pass command line arguments to your application.
 
     \image qtcreator-screenshot-run-settings-maemo.png "Run settings for Maemo devices"
 
-    To run and debug applications on Maemo devices, you must create connections
+    To run and debug applications on Maemo or MeeGo Harmattan devices, you must
+    create connections
     from the development PC to the devices. Click \gui {Manage device
     configurations} to create connections. For more information, see
     \l {Configuring Connections in Qt Creator}.
 
     By default, Qt Creator runs the remote gdbserver daemon on the device for
-    debugging. However, if the sysroot does not match that of the device, you
+    debugging. On Maemo 5, if the sysroot does not match that of the device,
+    you
     can run remote GDB, instead. Select the \gui {Use remote GDB} option in
     \gui {Debugging details}. Select the \gui {Set debugger} link to specify
     settings for GDB.
 
-    When you run the application on the \gui{Maemo} target, Qt Creator generates
+    When you run the application on the \gui{Maemo5} or \gui Harmattan target,
+    Qt Creator generates
     a Debian installation package in the build directory by default. You can deliver
-    the installation package to users for installation on Maemo devices that are of
+    the installation package to users for installation on devices that are of
     the same type and run the same firmware as the connected device. For more
-    information, see \l{Deploying Applications to Maemo Devices}.
+    information, see
+    \l{Deploying Applications to Maemo or MeeGo Harmattan Devices}.
 
     \section1 Specifying a Custom Executable to Run
 
@@ -4817,9 +4842,10 @@
     \page creator-deployment-maemo.html
     \nextpage creator-publishing-to-maemo-extras.html
 
-    \title Deploying Applications to Maemo Devices
+    \title Deploying Applications to Maemo or MeeGo Harmattan Devices
 
-    You can specify settings for deploying applications to Maemo devices in the
+    You can specify settings for deploying applications to Maemo 5 and MeeGo
+    Harmattan devices in the
     project .pro file. You can view the settings in the \gui {Run Settings}.
 
     \image qtcreator-maemo-deployment.png "Deploy to device"
@@ -4847,9 +4873,10 @@
 
     \section1 Creating Debian Installation Packages
 
-    When you run the application on the \gui{Maemo} target, Qt Creator generates
+    When you run the application on the \gui{Maemo5} or \gui Harmattan target,
+    Qt Creator generates
     a Debian installation package in the build directory by default. You can deliver
-    the installation package to users for installation on Maemo devices that are of
+    the installation package to users for installation on devices that are of
     the same type and run the same firmware as the connected device.
 
     \image qtcreator-maemo-deb-package.png "Create installation package"
@@ -4872,7 +4899,8 @@
     \note Qt Creator automates this process for you.
 
     Qt Creator provides templates for a set of files that must be included
-    in Debian packages. When you create a Maemo target for a project, Qt Creator
+    in Debian packages. When you create a \gui Maemo5 or \gui Harmattan target
+    for a project, Qt Creator
     asks whether packaging files are to be added to the project and to version
     control. If you plan to edit the packaging files, add them to version
     control.
@@ -4967,11 +4995,12 @@
     channel, you must make sure that the installation file meets the requirements for
     publishing and installing applications to Symbian or Maemo devices. The following
     sections describe the steps that you have to take to create installation packages
-    for Symbian and Maemo devices and for publishing on Ovi Store:
+    for Symbian, Maemo, or MeeGo Harmattan devices and for publishing on Ovi
+    Store:
 
     \list
         \o \l{Deploying Applications to Symbian Devices}
-        \o \l{Deploying Applications to Maemo Devices}
+        \o \l{Deploying Applications to Maemo or MeeGo Harmattan Devices}
         \o \l{Publishing Maemo Applications to Extras-devel}
         \o \l{Publishing Applications to Ovi Store}
         \o \l{Building with Remote Compiler}
@@ -5516,15 +5545,21 @@
 
     You set the application name and installation folder in the
     \gui {Run Settings} for the project. For more information, see
-    \l{Deploying Applications to Maemo Devices}. Qt Creator specifies the correct
+    \l{Deploying Applications to Maemo or MeeGo Harmattan Devices}. Qt Creator
+    specifies the correct
     category settings by default when it creates the Debian directory and
     the necessary files.
 
-    You can test the application on Qt Simulator and Maemo Emulator to make
+    You can test the application on Qt Simulator and Maemo emulator to make
     sure that it does not crash or hang and to check how it handles different
     memory situations. Before you submit the application to Ovi Publishing, you
     must also fully test it on a Maemo device.
 
+    \section1 Publishing Qt Content for MeeGo Harmattan Devices
+
+    You cannot publish applications that are built with the beta version of the
+    MeeGo Harmattan tool chain to Ovi Store.
+
 */
 
 /*!
@@ -5663,8 +5698,8 @@
 
         \image qtcreator-mobile-project-qt-versions.png "Target Setup dialog"
 
-        \o Select \gui {Maemo5}, \gui {Qt Simulator}, and \gui {Symbian
-        Device} targets,
+        \o Select \gui {Symbian Device}, \gui {Maemo5}, \gui Harmattan, and
+        \gui {Qt Simulator} targets,
         and click \gui{Next}.
 
         \note Targets are listed if you installed the appropriate development
@@ -5679,7 +5714,8 @@
         behaves when the orientation of the device display rotates between portrait
         and landscape, and then click \gui{Next}.
 
-        \note This dialog opens only if you select \gui Maemo5 or
+        \note This dialog opens only if you select \gui Maemo5, \gui Harmattan,
+        or
         \gui {Symbian Device} target in the \gui {Target Setup} dialog.
 
         The \gui {Symbian Specific} dialog opens.
@@ -5697,7 +5733,8 @@
         \image qtcreator-mobile-project-maemo-options.png "Maemo Specific dialog"
 
         \o In the \gui {Application icon (64x64)} field, select the application
-         icon to use on Maemo targets, or click \gui Next to use the default icon.
+         icon to use on Maemo 5 or Harmattan targets, or click \gui Next to use
+         the default icon.
 
         The \gui{Project Management} dialog opens.
 
@@ -5859,13 +5896,18 @@
 
     \endlist
 
-    \section1 Testing on the Maemo Emulator
+    \section1 Testing on the Maemo or MeeGo Harmattan Emulator
+
+    The Maemo 5 (Fremantle) and MeeGo Harmattan emulator are installed as part
+    of the \QSDK. After they are installed, you can start them from Qt Creator.
 
     The Maemo emulator emulates the Nokia N900 device environment. You can test
     applications in conditions practically identical to running the application
     on a Nokia N900 device with the software update release 1.3 (V20.2010.36-2).
 
-    For more information, see \l{Using the Maemo Emulator}.
+    The MeeGo Harmattan emulator emulates the Nokia N950 device environment.
+
+    For more information, see \l{Using Maemo or MeeGo Harmattan Emulator}.
 
 */
 
@@ -5889,7 +5931,8 @@
         \image qtcreator-gs-build-example-open.png "Selecting an example"
 
         \o Select targets for the project. Select at least Qt Simulator
-        and one of the mobile targets, Maemo or Symbian Device, depending on
+        and one of the mobile targets, Symbian Device, Maemo 5, or Harmattan,
+        depending on
         the device you develop for.
 
         \image qtcreator-gs-build-example-targets.png "Selecting targets"
@@ -7531,7 +7574,7 @@
     The on-device mode is a special mode available for run configurations
     targeting mobile devices. It debugs processes running on mobile
     devices using on-device debugging agents, such as CODA on Symbian and
-    gdbserver on Maemo and MeeGo.
+    gdbserver on Maemo and MeeGo Harmattan.
 
     To launch the debugger in the on-device mode, open the project, select a
     run configuration that targets a mobile device, and click the
@@ -7569,7 +7612,8 @@
     with and without the ability to use Python scripting. The Python enabled
     versions are preferred, but they are not available on Mac and on older
     versions of Linux.
-    On Windows, Symbian, and Maemo, only the Python version is supported.
+    On Windows, Symbian, Maemo, and MeeGo Harmattan, only the Python version is
+    supported.
 
     The non-Python versions use the compiled version of the debugging helpers,
     that you must enable separately. For more information, see
@@ -7633,6 +7677,12 @@
             \o GDB
             \o Yes
             \o On-device
+        \row
+            \o MeeGo Harmattan
+            \o GCC
+            \o GDB
+            \o Yes
+            \o On-device
     \endtable
 
     For more information on the debugger modes, see \l{Launching the Debugger in Different Modes}.
@@ -9094,7 +9144,8 @@
         behaves when the orientation of the device display rotates between portrait
         and landscape, and then click \gui Next.
 
-        \note This dialog opens only if you select \gui Maemo5 or
+        \note This dialog opens only if you select \gui Harmattan, \gui Maemo5,
+        or
         \gui {Symbian Device} target in the \gui {Target Setup} dialog.
 
         The \gui {Symbian Specific} dialog opens.
@@ -9118,7 +9169,7 @@
         \image qmldesigner-new-project-maemo-options.png "Maemo Specific dialog"
 
         \o In the \gui {Application icon (64x64)} field, select the application
-         icon to use on Maemo targets, or use the default icon.
+         icon to use on Maemo or Harmattan targets, or use the default icon.
 
         The \gui {QML Sources} dialog opens.
 
@@ -9142,7 +9193,7 @@
     \endlist
 
     Qt Creator creates the necessary boilerplate files. Some of the files are
-    specific to the Symbian or Maemo platform.
+    specific to the Symbian, Maemo, or MeeGo Harmattan platform.
 
     \section1 Importing QML Applications
 
@@ -9946,40 +9997,48 @@
     \page creator-maemo-emulator.html
     \nextpage creator-mime-types.html
 
-    \title Using the Maemo Emulator
+    \title Using Maemo or MeeGo Harmattan Emulator
+
+    The Maemo 5 (Fremantle) and MeeGo Harmattan emulator are installed as part
+    of the \QSDK. After they are installed, you can start them from Qt Creator.
 
     The Maemo 5 emulator emulates the Nokia N900 device environment. You can test
     applications in conditions practically identical to running the application
     on a Nokia N900 device with software update release 1.3 (V20.2010.36-2).
-    You can test user interaction by using the keypad and
-    touch emulation.
+
+    The MeeGo Harmattan emulator emulates the Nokia N950 device environment.
+
+    With the emulators, you can test how your application reacts to hardware
+    controls, such as the power button, and to the touch screen.
 
     To test the application UI, user interaction with the application, and
     functionality that uses the mobility APIs, use the Qt Simulator,
     instead. For more information, see the
     \l{http://doc.qt.nokia.com/qtsimulator/index.html}{Qt Simulator Manual}.
 
-    The Maemo 5 emulator is installed and configured as part of the \QSDK
-    package. You can also install and configure the MADDE environment and
-    Maemo emulator separately. For more information, see
-    \l{Connecting Maemo Devices}.
+    The difference between Qt Simulator and the emulators is that when you
+    compile your application binary for Qt Simulator, it is compiled against a
+    host library. The binary run on the emulator is compiled for the actual
+    device, using the Maemo 5 or Harmattan tool chain.
 
-    \section1 Starting the Maemo Emulator
+    \section1 Starting the Emulator
 
     The \gui {Start Maemo Emulator} button is visible if you have a project
-    open in Qt Creator for which you have added the Maemo build target.
+    open in Qt Creator for which you have added the Maemo or MeeGo Harmattan
+    build target. It starts the Maemo or MeeGo Harmattan emulator, depending
+    on the selected target.
 
-    To start the Maemo emulator, click
+    To start the emulator, click
     \inlineimage qtcreator-maemo-emulator-button.png "Start Maemo Emulator button"
     .
 
     Test your application on the Maemo emulator as on a device. For a list of
-    keyboard shortcuts that you can use to emulate Nokia N900 keys and functions, see
-    \l {Emulating Nokia N900 Keys}.
+    keyboard shortcuts that you can use to emulate keys and functions, see
+    \l {Emulating Device Keys}.
 
     \section1 Rendering Graphics
 
-    The Maemo emulator supports OpenGL to improve graphics rendering. Hardware
+    The emulators support OpenGL to improve graphics rendering. Hardware
     acceleration produces better results than software rendering. By default,
     Qt Creator automatically detects, whether hardware acceleration is
     supported on the development PC and tries to use it. However, sometimes
@@ -9987,20 +10046,20 @@
     hardware acceleration might be selected even if it is actually not
     available on the development PC. This causes the emulator to crash.
 
-    If the Maemo emulator crashes, you are asked whether you want to try
-    software rendering, instead.
+    If the emulator crashes, you are asked whether you want to try software
+    rendering, instead.
 
     To specify the OpenGL mode, select \gui {Tools > Options... > Maemo > Qemu
     Settings}.
 
-    \section1 Emulating Nokia N900 Keys
+    \section1 Emulating Device Keys
 
     The following table summarizes the keyboard shortcuts that you can use
-    to emulate Nokia N900 keys and functions.
+    to emulate device keys and functions.
 
     \table
         \header
-            \o Nokia N900 Key
+            \o Device Key
             \o Keyboard Shortcut
         \row
             \o \list
@@ -10015,13 +10074,19 @@
             \o Respective keys on the development PC keyboard.
         \row
             \o Shift
-            \o Left Shift key
+            \o Left Shift key (Maemo 5)
+
+               Shift (Harmattan)
         \row
             \o Ctrl
-            \o Left Ctrl key
+            \o Left Ctrl key (Maemo 5)
+
+               Ctrl (Harmattan)
         \row
             \o Mode
-            \o Left Alt key
+            \o Left Alt key (Maemo 5)
+
+               Alt (Harmattan)
         \row
             \o Power
             \o Esc
@@ -10029,10 +10094,10 @@
             \o Keypad slider open and close
             \o F1
         \row
-            \o Keypad lock
+            \o Keypad lock (Maemo 5 only)
             \o F2
         \row
-            \o Camera lens open and close
+            \o Camera lens open and close (Maemo 5 only)
             \o F3
         \row
             \o Camera focus
@@ -10040,9 +10105,10 @@
         \row
             \o Camera take picture
             \o F5
+
             \note The actual camera functionality is not emulated.
         \row
-            \o Stereo headphones connect and disconnect
+            \o Stereo headphones connect and disconnect (Maemo 5 only)
             \o F6
         \row
             \o Volume down
@@ -10071,6 +10137,15 @@
 
     \endtable
 
+    \note Each press of the accelerometer key turns the acceleration by 50
+    percent.
+
+    \section1 Closing the Emulator
+
+    To close the emulator, click the X at the top right corner of the device
+    emulator view. The emulator interprets this as a press of the power button
+    and displays the text \e {Shutting down} in the emulator window title pane.
+    The emulator closes shortly after this.
 
 */
 
@@ -10266,6 +10341,7 @@
 
        \o Remember the processing limits of the device
 
+
        The memory available on devices is limited
        and you should use it carefully. Although all mobile devices have common functionality,
        each device is individual in terms of both the resources available and extra features.
@@ -11132,9 +11208,8 @@
 
         \o Creating new CMake projects with Qt Creator is not supported.
 
-        \o Building and packaging subprojects is not supported for Maemo devices.
-
-        \o You must create projects for Maemo targets on the same partition where
+        \o On Windows, you must create projects for Maemo 5 and Harmattan
+        targets on the same partition where
         you installed \QSDK, Qt Creator, and MADDE.
 
         \o If error messages displayed in the \gui {Compile Output} pane contain
@@ -11716,7 +11791,7 @@
         \o \l{Using Version Control Systems}
         \o \l{Adding Qt Designer Plugins}
         \o \l{Using External Tools}
-        \o \l{Using the Maemo Emulator}
+        \o \l{Using Maemo or MeeGo Harmattan Emulator}
         \o \l{Editing MIME Types}
         \o \l{Showing Task List Files in the Build Issues Pane}
         \o \l{Using Command Line Options}